vcsh: More resilient variable handling for 6b22746e94bf469dd462907fd43d13a454e56ede

[code/vcsh.git] / vcsh

diff --git a/vcsh b/vcsh
index cb7eada9a88ff1a42c898e026b684f62479f8ee2..93e9c9e2f55a1abc4a143a023714d6cbf84e1b83 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


@@ -247,7 +247,7 @@ list_tracked_by() {
 pull() {
        hook pre-pull
        for VCSH_REPO_NAME in $(list); do
 pull() {
        hook pre-pull
        for VCSH_REPO_NAME in $(list); do

-               echo -n "$VCSH_REPO_NAME: "
+               printf "$VCSH_REPO_NAME: "

                export GIT_DIR="$VCSH_REPO_D/$VCSH_REPO_NAME.git"
                use
                git pull
                export GIT_DIR="$VCSH_REPO_D/$VCSH_REPO_NAME.git"
                use
                git pull


@@ -259,7 +259,7 @@ pull() {
 push() {
        hook pre-push
        for VCSH_REPO_NAME in $(list); do
 push() {
        hook pre-push
        for VCSH_REPO_NAME in $(list); do

-               echo -n "$VCSH_REPO_NAME: "
+               printf "$VCSH_REPO_NAME: "

                export GIT_DIR="$VCSH_REPO_D/$VCSH_REPO_NAME.git"
                use
                git push
                export GIT_DIR="$VCSH_REPO_D/$VCSH_REPO_NAME.git"
                use
                git push


@@ -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