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

[code/vcsh.git] / vcsh
diff --git a/vcsh b/vcsh

index dd3d91e7cd811a32ee7292de57ebb1d4e62ecb9a..0df962b0b6cc48def7ef63e95243c8e91d92ab35 100755 (executable)
--- a/vcsh
+++ b/vcsh
@@ -1,6 +1,6 @@
  #!/bin/sh
  
-[ "$VCSH_DEBUG" = '1' ] && set -x
+[ -n "$VCSH_DEBUG" ] && set -x
  
  SELF=$(basename $0)
  
@@ -20,11 +20,11 @@ done
  VCSH_BASE="$XDG_CONFIG_HOME/vcsh/repo.d"
  
  debug() {
-       [ "$VCSH_DEBUG" = '1' ] && echo "$SELF: debug: $1"
+       [ -n "$VCSH_DEBUG" ] && echo "$SELF: debug: $1"
  }
  
  verbose() {
-       if [ "$VCSH_DEBUG" = '1' ] || [ "$VCSH_VERBOSE" = '1' ]; then echo "$SELF: verbose: $1"; fi
+       if [ -n "$VCSH_DEBUG" ] || [ -n "$VCSH_VERBOSE" ]; then echo "$SELF: verbose: $1"; fi
  }
  
  #   use <repo>     Use this repository
@@ -151,7 +151,7 @@ elif [ "$1" = 'clone' ]; then
  
  elif [ "$1" = 'init' ]; then
         verbose "init begin"
-       [ -z $2 ] && help; return 0
+       [ -z $2 ] && help && return 0
         export REPO_NAME="$2"
         export GIT_DIR="$VCSH_BASE/$REPO_NAME.git"
         init