Llewellyn/Tomb
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/Tomb.git synced 2025-02-02 11:58:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

TMPPREFIX is not supposed to be a directory

Browse Source 
http://zsh.sourceforge.net/Doc/Release/Files.html
TMPPREFIX defaults to /tmp/zsh (for zsh shell)

Note: --tmp command line switch is not documented?

Signed-off-by: Matthieu Crapet <mcrapet@gmail.com>
This commit is contained in:
Matthieu Crapet 2021-01-01 21:58:23 +01:00
parent 312915b4b3
commit 859a5c7783
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tomb
View File

@ -33,7 +33,7 @@
typeset VERSION="2.8.1" typeset VERSION="2.8.1"
typeset DATE="Nov/2020" typeset DATE="Nov/2020"
typeset TOMBEXEC=$0 typeset TOMBEXEC=$0
typeset TMPPREFIX=${TMPPREFIX:-/tmp} typeset TMPDIR=${${TMPPREFIX%/*}:-/tmp}
# TODO: configure which tmp dir to use from a cli flag # TODO: configure which tmp dir to use from a cli flag
# Tomb is using some global variables set by the shell: # Tomb is using some global variables set by the shell:
@ -245,15 +245,15 @@ _whoami() {
# Provide a random filename in shared memory # Provide a random filename in shared memory
_tmp_create() { _tmp_create() {
[[ -d "$TMPPREFIX" ]] || { [[ -d "$TMPDIR" ]] || {
# we create the tempdir with the sticky bit on # we create the tempdir with the sticky bit on
_sudo mkdir -m 1777 "$TMPPREFIX" _sudo mkdir -m 1777 "$TMPDIR"
[[ $? == 0 ]] || _failure "Fatal error creating the temporary directory: ::1 temp dir::" "$TMPPREFIX" [[ $? == 0 ]] || _failure "Fatal error creating the temporary directory: ::1 temp dir::" "$TMPDIR"
} }
# We're going to add one more $RANDOM for each time someone complains # We're going to add one more $RANDOM for each time someone complains
# about this being too weak of a random. # about this being too weak of a random.
tfile="${TMPPREFIX}/$RANDOM$RANDOM$RANDOM$RANDOM" # Temporary file tfile="${TMPDIR}/$RANDOM$RANDOM$RANDOM$RANDOM" # Temporary file
umask 066 umask 066
[[ $? == 0 ]] || { [[ $? == 0 ]] || {
_failure "Fatal error setting the permission umask for temporary files" } _failure "Fatal error setting the permission umask for temporary files" }
@ -3219,7 +3219,7 @@ main() {
done done
} }
# read -t or --tmp flags to set a custom temporary directory # read -t or --tmp flags to set a custom temporary directory
option_is_set --tmp && TMPPREFIX=$(option_value --tmp) option_is_set --tmp && TMPDIR=$(option_value --tmp)
# When we run as root, we remember the original uid:gid to set # When we run as root, we remember the original uid:gid to set
@ -3237,7 +3237,7 @@ main() {
$_UID $_GID $_TTY $_UID $_GID $_TTY
} }
_verbose "Temporary directory: $TMPPREFIX" _verbose "Temporary directory: $TMPDIR"
# Process subcommand # Process subcommand
case "$subcommand" in case "$subcommand" in