Merge branch 'master' of github.com:RichiH/vcsh

[code/vcsh.git] / vcsh

diff --git a/vcsh b/vcsh
index 1de5ed77a768795406426682d97a3e10f4024600..cf0c8cf1d3dacfcf69cc6a0a95c050527881a419 100755 (executable)
--- a/vcsh
+++ b/vcsh
@@ -24,7 +24,7 @@ basename() {
 }
 
 SELF=$(basename $0)
 }
 
 SELF=$(basename $0)

-VERSION='1.20130829'
+VERSION='1.20130909'

 
 fatal() {
        echo "$SELF: fatal: $1" >&2
 
 fatal() {
        echo "$SELF: fatal: $1" >&2


@@ -365,7 +365,11 @@ write_gitignore() {
                        file="$new"
                done;
        done | sort -u)
                        file="$new"
                done;
        done | sort -u)

-       tempfile=$(mktemp) || fatal "could not create tempfile" 51
+
+       # 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
+

        echo '*' > "$tempfile" || fatal "could not write to '$tempfile'" 57
        for gitignore in $gitignores; do
                echo "$gitignore" | sed 's@^@!/@' >> "$tempfile" || fatal "could not write to '$tempfile'" 57
        echo '*' > "$tempfile" || fatal "could not write to '$tempfile'" 57
        for gitignore in $gitignores; do
                echo "$gitignore" | sed 's@^@!/@' >> "$tempfile" || fatal "could not write to '$tempfile'" 57


@@ -395,6 +399,7 @@ if [ "$1" = 'clone' ]; then
        export GIT_DIR="$VCSH_REPO_D/$VCSH_REPO_NAME.git"
 elif [ "$1" = 'version' ]; then
        echo "$SELF $VERSION"
        export GIT_DIR="$VCSH_REPO_D/$VCSH_REPO_NAME.git"
 elif [ "$1" = 'version' ]; then
        echo "$SELF $VERSION"

+       git version

        exit
 elif [ "$1" = 'which' ]; then
        [ -z "$2" ] && fatal "$1: please specify a filename" 1
        exit
 elif [ "$1" = 'which' ]; then
        [ -z "$2" ] && fatal "$1: please specify a filename" 1