Fix version processing on BSD systems.

[code/vcsh.git] / vcsh

diff --git a/vcsh b/vcsh
index 183eb179b8a2922913550b3436175b4b266c38e5..d1d26eddcc44809ae3cfa82c448e68bc23c2082d 100755 (executable)
--- a/vcsh
+++ b/vcsh
@@ -22,6 +22,9 @@
 VERSION='1.20141026'
 SELF=$(basename $0)
 
 VERSION='1.20141026'
 SELF=$(basename $0)
 

+# Ensure all files created are accessible only to the current user.
+umask 0077
+

 fatal() {
        echo "$SELF: fatal: $1" >&2
        [ -z $2 ] && exit 1
 fatal() {
        echo "$SELF: fatal: $1" >&2
        [ -z $2 ] && exit 1


@@ -106,6 +109,7 @@ help() {
    commit               Commit in all repositories
    delete <repo>        Delete an existing repository
    enter <repo>         Enter repository; spawn new instance of \$SHELL
    commit               Commit in all repositories
    delete <repo>        Delete an existing repository
    enter <repo>         Enter repository; spawn new instance of \$SHELL

+                        with \$GIT_DIR set.

    foreach [<-g>]
      <git command>      Execute a command for every repository
    help                 Display this help text
    foreach [<-g>]
      <git command>      Execute a command for every repository
    help                 Display this help text


@@ -162,7 +166,7 @@ clone() {
   You should add files to your new repository."
                exit
        fi
   You should add files to your new repository."
                exit
        fi

-       GIT_VERSION_MAJOR=$(git --version | sed -n 's/.* \([0-9]\)\..*/\1/p' )
+       GIT_VERSION_MAJOR=$(git --version | sed -E -n 's/.* ([0-9]+)\..*/\1/p' )

        if [ 1 -lt "$GIT_VERSION_MAJOR" ];then
                git fetch origin "$VCSH_BRANCH"
        else
        if [ 1 -lt "$GIT_VERSION_MAJOR" ];then
                git fetch origin "$VCSH_BRANCH"
        else


@@ -186,11 +190,12 @@ clone() {
 
 commit() {
        hook pre-commit
 
 commit() {
        hook pre-commit

+        shift  # remove the "commit" command.

        for VCSH_REPO_NAME in $(list); do
                echo "$VCSH_REPO_NAME: "
                GIT_DIR=$VCSH_REPO_D/$VCSH_REPO_NAME.git; export GIT_DIR
                use
        for VCSH_REPO_NAME in $(list); do
                echo "$VCSH_REPO_NAME: "
                GIT_DIR=$VCSH_REPO_D/$VCSH_REPO_NAME.git; export GIT_DIR
                use

-               git commit --untracked-files=no --quiet $@
+               git commit --untracked-files=no --quiet "$@"

                VCSH_COMMAND_RETURN_CODE=$?
                echo
        done
                VCSH_COMMAND_RETURN_CODE=$?
                echo
        done


@@ -261,7 +266,7 @@ init() {
        [ ! -e "$GIT_DIR" ] || fatal "'$GIT_DIR' exists" 10
        mkdir -p "$VCSH_BASE" || fatal "could not create '$VCSH_BASE'" 50
        cd "$VCSH_BASE" || fatal "could not enter '$VCSH_BASE'" 11
        [ ! -e "$GIT_DIR" ] || fatal "'$GIT_DIR' exists" 10
        mkdir -p "$VCSH_BASE" || fatal "could not create '$VCSH_BASE'" 50
        cd "$VCSH_BASE" || fatal "could not enter '$VCSH_BASE'" 11

-       git init --shared=0600
+       git init --shared=false

        upgrade
        hook post-init
 }
        upgrade
        hook post-init
 }


@@ -477,8 +482,8 @@ write_gitignore() {
        use
        cd "$VCSH_BASE" || fatal "could not enter '$VCSH_BASE'" 11
        local GIT_VERSION="$(git --version)"
        use
        cd "$VCSH_BASE" || fatal "could not enter '$VCSH_BASE'" 11
        local GIT_VERSION="$(git --version)"

-       local GIT_VERSION_MAJOR=$(echo $GIT_VERSION | sed -n 's/.* \([0-9]\)\..*/\1/p')
-       local GIT_VERSION_MINOR=$(echo $GIT_VERSION | sed -n 's/.* \([0-9]\)\.\([0-9]\)\..*/\2/p')
+       local GIT_VERSION_MAJOR=$(echo $GIT_VERSION | sed -E -n 's/.* ([0-9]+)\..*/\1/p')
+       local GIT_VERSION_MINOR=$(echo $GIT_VERSION | sed -E -n 's/.* ([0-9]+)\.([0-9]+)\..*/\2/p')

        OLDIFS=$IFS
        IFS=$(printf '\n\t')
        gitignores=$(for file in $(git ls-files); do
        OLDIFS=$IFS
        IFS=$(printf '\n\t')
        gitignores=$(for file in $(git ls-files); do