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

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:

Fix version processing on BSD systems.
[code/vcsh.git] / vcsh
diff --git a/vcsh b/vcsh
index f06f5b456985dda6269b3541195b0e2c2c34fe6a..d1d26eddcc44809ae3cfa82c448e68bc23c2082d 100755 (executable)
--- a/vcsh
+++ b/vcsh
@@ -166,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
@@ -482,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