]> git.madduck.net Git - code/vcsh.git/commitdiff

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

vcsh: Fix mktemp bug
authorRichard Hartmann <richih@debian.org>
Sat, 28 Dec 2013 14:17:36 +0000 (15:17 +0100)
committerRichard Hartmann <richih@debian.org>
Sat, 28 Dec 2013 14:17:36 +0000 (15:17 +0100)
2650689d28f662e147d0be4c3ee248f873dbcc3c introduced a bug:
If we are using a template, GNU mktemp will use PWD instead of $TMPDIR

vcsh

diff --git a/vcsh b/vcsh
index 58f5585eb2d8bc0b8872de79afe1d61841f61288..af41890cddc3737a6e3a30fc43aca1388909f45d 100755 (executable)
--- a/vcsh
+++ b/vcsh
@@ -360,7 +360,9 @@ write_gitignore() {
 
        # Contrary to GNU mktemp, mktemp on BSD/OSX requires a template for temp files
        # Use the template GNU mktemo defaults to
-       tempfile=$(mktemp tmp.XXXXXXXXXX) || fatal "could not create tempfile" 51
+       # The downside to this is that we need to set TMPDIR explicitly; this may or may not be empty, so...
+       [ -z "$TMPDIR" ] && TMPDIR='/tmp'
+       tempfile=$(mktemp ${TMPDIR}/tmp.XXXXXXXXXX) || fatal "could not create tempfile" 51
 
        echo '*' > "$tempfile" || fatal "could not write to '$tempfile'" 57
        for gitignore in $gitignores; do