Use sh 'default value' expansion more idiomatic construct

[code/vcsh.git] / vcsh

diff --git a/vcsh b/vcsh
index 58b574485aed84677e80ab5c224362a130c9e757..79ae0e0124e7fae4e4058620e8fce10aa29f9b70 100755 (executable)
--- a/vcsh
+++ b/vcsh
@@ -32,11 +32,11 @@ while getopts "c:dv" flag; do
                VCSH_DEBUG=1
                echo "debug mode on"
                echo "$SELF $VERSION"
                VCSH_DEBUG=1
                echo "debug mode on"
                echo "$SELF $VERSION"

-       elif [ "$1" = '-v' ];then
+       elif [ "$1" = '-v' ]; then

                VCSH_VERBOSE=1
                echo "verbose mode on"
                echo "$SELF $VERSION"
                VCSH_VERBOSE=1
                echo "verbose mode on"
                echo "$SELF $VERSION"

-       elif [ "$1" = '-c' ];then
+       elif [ "$1" = '-c' ]; then

                VCSH_OPTION_CONFIG=$OPTARG
        fi
        shift 1
                VCSH_OPTION_CONFIG=$OPTARG
        fi
        shift 1


@@ -360,7 +360,8 @@ write_gitignore() {
 
        # Contrary to GNU mktemp, mktemp on BSD/OSX requires a template for temp files
        # Use the template GNU mktemo defaults to
 
        # 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 account for unset TMPDIR
+       tempfile=$(mktemp ${TMPDIR:-/tmp}/tmp.XXXXXXXXXX) || fatal "could not create tempfile: '${tempfile}'" 51

 
        echo '*' > "$tempfile" || fatal "could not write to '$tempfile'" 57
        for gitignore in $gitignores; do
 
        echo '*' > "$tempfile" || fatal "could not write to '$tempfile'" 57
        for gitignore in $gitignores; do