provide a global temporary directory

The standard procedure 'tmp=mktemp; trap "rm $tmp" 0' was broken with the
introduction of the pager. Which overwrites the trap itself to close and
remove the pager fifo.

Now tg provides a temp playground and all other temp files should be created
inside this directory and only this directory will be removed with the exit
trap. setup_pager still overwrites the trap, but keeps the rm command from
the global temp directory. To simplify this the new function get_temp() is
provided.

Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

diff --git a/hooks/pre-commit.sh b/hooks/pre-commit.sh
index 4f2f16f33cf10cbf9dc5da3eeea5ef272521d9f2..c52a26847c90eb36a0a5e0fdb09c1e142ba7f416 100644 (file)
--- a/hooks/pre-commit.sh
+++ b/hooks/pre-commit.sh
@@ -95,9 +95,8 @@ BEGIN      { in_hunk = 0; }
        done
 
 # check for repetitions of deps
        done
 
 # check for repetitions of deps

-depdir="$(mktemp -t -d tg-depdir.XXXXXX)" ||
+depdir="$(get_temp tg-depdir -d)" ||

        die "Can't check for multiple occurrences of deps"
        die "Can't check for multiple occurrences of deps"

-trap "rm -rf '$depdir'" 0

 cat_file "(i):.topdeps" |
        while read dep; do
                [ ! -d "$depdir/$dep" ] ||
 cat_file "(i):.topdeps" |
        while read dep; do
                [ ! -d "$depdir/$dep" ] ||

diff --git a/tg-export.sh b/tg-export.sh
index 4b0148c1d7770eb5cb6f1e9fda1a5bf1e327afd1..1d0533e4dac05993775ad0aa4ef004eb5a01c252 100644 (file)
--- a/tg-export.sh
+++ b/tg-export.sh
@@ -57,8 +57,7 @@ if [ -z "$branches" ]; then
 fi
 
 
 fi
 
 

-playground="$(mktemp -d -t tg-export.XXXXXX)"
-trap 'rm -rf "$playground"' EXIT
+playground="$(get_temp tg-export -d)"

 
 
 ## Collapse driver
 
 
 ## Collapse driver

diff --git a/tg-info.sh b/tg-info.sh
index 7d6a34ca617bc8d6ffc44f81613d30715905688c..10e257e635308cfb1f997f3ea9acd906907aa479 100644 (file)
--- a/tg-info.sh
+++ b/tg-info.sh
@@ -51,7 +51,7 @@ fi
 git cat-file blob "$name:.topdeps" |
        sed '1{ s/^/Depends: /; n; }; s/^/         /;'
 
 git cat-file blob "$name:.topdeps" |
        sed '1{ s/^/Depends: /; n; }; s/^/         /;'
 

-depcheck="$(mktemp -t tg-depcheck.XXXXXX)"
+depcheck="$(get_temp tg-depcheck)"

 missing_deps=
 needs_update "$name" >"$depcheck" || :
 if [ -n "$missing_deps" ]; then
 missing_deps=
 needs_update "$name" >"$depcheck" || :
 if [ -n "$missing_deps" ]; then


@@ -72,6 +72,5 @@ if [ -s "$depcheck" ]; then
 else
        echo "Up-to-date."
 fi
 else
        echo "Up-to-date."
 fi

-rm "$depcheck"

 
 # vim:noet
 
 # vim:noet

diff --git a/tg-mail.sh b/tg-mail.sh
index 8167adecb7421d6750205bd9304243f587a2e4d4..dd4a95a74ad9e47ed39dbff05f5f5d53993981e7 100644 (file)
--- a/tg-mail.sh
+++ b/tg-mail.sh
@@ -34,7 +34,7 @@ if [ -n "$in_reply_to" ]; then
 fi
 
 
 fi
 
 

-patchfile="$(mktemp -t tg-mail.XXXXXX)"
+patchfile="$(get_temp tg-mail)"

 
 $tg patch "$name" >"$patchfile"
 
 
 $tg patch "$name" >"$patchfile"
 


@@ -54,6 +54,4 @@ people=
 # NOTE: git-send-email handles cc itself
 eval git send-email $send_email_args "$people" "$patchfile"
 
 # NOTE: git-send-email handles cc itself
 eval git send-email $send_email_args "$people" "$patchfile"
 

-rm "$patchfile"
-

 # vim:noet
 # vim:noet

diff --git a/tg-patch.sh b/tg-patch.sh
index 7bafdfe1896a2181dd572f99ad2e81553b7df409..68efcf0850e815ee3f55edb347684364d41b9a4b 100644 (file)
--- a/tg-patch.sh
+++ b/tg-patch.sh
@@ -51,7 +51,7 @@ echo
 [ -n "$(git grep $diff_opts '^[-]--' ${diff_committed_only:+"$name"} -- ".topmsg")" ] || echo '---'
 
 # Evil obnoxious hack to work around the lack of git diff --exclude
 [ -n "$(git grep $diff_opts '^[-]--' ${diff_committed_only:+"$name"} -- ".topmsg")" ] || echo '---'
 
 # Evil obnoxious hack to work around the lack of git diff --exclude

-git_is_stupid="$(mktemp -t tg-patch-changes.XXXXXX)"
+git_is_stupid="$(get_temp tg-patch-changes)"

 git diff --name-only $diff_opts "$base_rev" ${diff_committed_only:+"$name"} -- |
        fgrep -vx ".topdeps" |
        fgrep -vx ".topmsg" >"$git_is_stupid" || : # fgrep likes to fail randomly?
 git diff --name-only $diff_opts "$base_rev" ${diff_committed_only:+"$name"} -- |
        fgrep -vx ".topdeps" |
        fgrep -vx ".topmsg" >"$git_is_stupid" || : # fgrep likes to fail randomly?


@@ -61,7 +61,6 @@ if [ -s "$git_is_stupid" ]; then
 else
        echo "No changes."
 fi
 else
        echo "No changes."
 fi

-rm "$git_is_stupid"

 
 echo '-- '
 echo "tg: ($base_rev..) $name (depends on: $(cat_file "$topic:.topdeps" | paste -s -d' '))"
 
 echo '-- '
 echo "tg: ($base_rev..) $name (depends on: $(cat_file "$topic:.topdeps" | paste -s -d' '))"

diff --git a/tg-push.sh b/tg-push.sh
index 199d7389b48ea4563ac2217022f410b2aebf4d4b..a928fba8e9e93a522f966004bea28c0c6fc1fe07 100644 (file)
--- a/tg-push.sh
+++ b/tg-push.sh
@@ -45,8 +45,7 @@ for name in $branches; do
        ref_exists "$name" || die "detached HEAD? Can't push $name"
 done
 
        ref_exists "$name" || die "detached HEAD? Can't push $name"
 done
 

-_listfile="$(mktemp -t tg-push-listfile.XXXXXX)"
-trap "rm -f \"$_listfile\"" 0
+_listfile="$(get_temp tg-push-listfile)"

 
 push_branch()
 {
 
 push_branch()
 {

diff --git a/tg-summary.sh b/tg-summary.sh
index af16888c1797db909dbcff7d2ff15c1cf0ec0b28..612bd27443779266de3385dfce6b2812be81f85a 100644 (file)
--- a/tg-summary.sh
+++ b/tg-summary.sh
@@ -55,10 +55,9 @@ EOT
 fi
 
 if [ -n "$sort" ]; then
 fi
 
 if [ -n "$sort" ]; then

-       tsort_input=`mktemp`
+       tsort_input="$(get_temp tg-summary-sort)"

        exec 4>$tsort_input
        exec 5<$tsort_input
        exec 4>$tsort_input
        exec 5<$tsort_input

-       rm $tsort_input

 fi
 
 ## List branches
 fi
 
 ## List branches

diff --git a/tg-update.sh b/tg-update.sh
index b256c7c270b41c4e8f5d384a7ece4011d07beb74..5162c52b9d335f383a0bdb54ceb0c5929463b20f 100644 (file)
--- a/tg-update.sh
+++ b/tg-update.sh
@@ -27,7 +27,7 @@ base_rev="$(git rev-parse --short --verify "refs/top-bases/$name" 2>/dev/null)"
 
 ## First, take care of our base
 
 
 ## First, take care of our base
 

-depcheck="$(mktemp -t tg-depcheck.XXXXXX)"
+depcheck="$(get_temp tg-depcheck)"

 missing_deps=
 needs_update "$name" >"$depcheck" || :
 [ -z "$missing_deps" ] || die "some dependencies are missing: $missing_deps"
 missing_deps=
 needs_update "$name" >"$depcheck" || :
 [ -z "$missing_deps" ] || die "some dependencies are missing: $missing_deps"


@@ -96,7 +96,6 @@ if [ -s "$depcheck" ]; then
 else
        info "The base is up-to-date."
 fi
 else
        info "The base is up-to-date."
 fi

-rm "$depcheck"

 
 # Home, sweet home...
 # (We want to always switch back, in case we were on the base from failed
 
 # Home, sweet home...
 # (We want to always switch back, in case we were on the base from failed

diff --git a/tg.sh b/tg.sh
index f1b323b7cbe543994f373523ab2b84b814fd0adc..72dc53418ade2674b4ea84e65b7f941f5f2e3bff 100644 (file)
--- a/tg.sh
+++ b/tg.sh
@@ -199,7 +199,7 @@ recurse_deps()
        _name="$1"; # no shift
        _depchain="$*"
 
        _name="$1"; # no shift
        _depchain="$*"
 

-       _depsfile="$(mktemp -t tg-depsfile.XXXXXX)"
+       _depsfile="$(get_temp tg-depsfile)"

        # If no_remotes is unset check also our base against remote base.
        # Checking our head against remote head has to be done in the helper.
        if test -z "$no_remotes" && has_remote "top-bases/$_name"; then
        # If no_remotes is unset check also our base against remote base.
        # Checking our head against remote head has to be done in the helper.
        if test -z "$no_remotes" && has_remote "top-bases/$_name"; then


@@ -232,7 +232,6 @@ recurse_deps()
                eval "$_cmd"
        done <"$_depsfile"
        missing_deps="${missing_deps# }"
                eval "$_cmd"
        done <"$_depsfile"
        missing_deps="${missing_deps# }"

-       rm "$_depsfile"

        return $_ret
 }
 
        return $_ret
 }
 


@@ -383,19 +382,28 @@ setup_pager()
        # now spawn pager
        export LESS="${LESS:-FRSX}"     # as in pager.c:pager_preexec()
 
        # now spawn pager
        export LESS="${LESS:-FRSX}"     # as in pager.c:pager_preexec()
 

-       _pager_fifo_dir="$(mktemp -t -d tg-pager-fifo.XXXXXX)"
-       _pager_fifo="$_pager_fifo_dir/0"
-       mkfifo -m 600 "$_pager_fifo"
+       # setup_pager should be called only once per command
+       pager_fifo="$tg_tmp_dir/pager"
+       mkfifo -m 600 "$pager_fifo"

 
 

-       "$TG_PAGER" < "$_pager_fifo" &
-       exec > "$_pager_fifo"           # dup2(pager_fifo.in, 1)
+       "$TG_PAGER" < "$pager_fifo" &
+       exec > "$pager_fifo"            # dup2(pager_fifo.in, 1)

 
        # this is needed so e.g. `git diff` will still colorize it's output if
        # requested in ~/.gitconfig with color.diff=auto
        export GIT_PAGER_IN_USE=1
 
        # atexit(close(1); wait pager)
 
        # this is needed so e.g. `git diff` will still colorize it's output if
        # requested in ~/.gitconfig with color.diff=auto
        export GIT_PAGER_IN_USE=1
 
        # atexit(close(1); wait pager)

-       trap "exec >&-; rm \"$_pager_fifo\"; rmdir \"$_pager_fifo_dir\"; wait" EXIT
+       # deliberately overwrites the global EXIT trap
+       trap "exec >&-; rm -rf \"$tg_tmp_dir\"; wait" EXIT
+}
+
+# get_temp NAME [-d]
+# creates a new temporary file (or directory with -d) in the global
+# temporary directory $tg_tmp_dir with pattern prefix NAME
+get_temp()
+{
+       mktemp ${2-} "$tg_tmp_dir/$1.XXXXXX"

 }
 
 ## Startup
 }
 
 ## Startup


@@ -415,6 +423,9 @@ tg="tg"
 # make sure merging the .top* files will always behave sanely
 setup_ours
 setup_hook "pre-commit"
 # make sure merging the .top* files will always behave sanely
 setup_ours
 setup_hook "pre-commit"

+# create global temporary directories, inside GIT_DIR
+tg_tmp_dir="$(mktemp -d "$git_dir/tg-tmp.XXXXXX")"
+trap "rm -rf \"$tg_tmp_dir\"" EXIT

 
 ## Dispatch
 
 
 ## Dispatch