X-Git-Url: https://git.madduck.net/code/vcsh.git/blobdiff_plain/e003251cbc13ebebe944049f45a5c344c2d5b603..91a1772555cbf6c7a86ee49dc97658ab81fd86d3:/vcsh diff --git a/vcsh b/vcsh index dd3d91e..7f475fe 100755 --- a/vcsh +++ b/vcsh @@ -1,30 +1,30 @@ #!/bin/sh -[ "$VCSH_DEBUG" = '1' ] && set -x +[ -n "$VCSH_DEBUG" ] && set -x SELF=$(basename $0) [ -z "$XDG_CONFIG_HOME" ] && XDG_CONFIG_HOME="$HOME/.config" -for check_directory in "$XDG_CONFIG_HOME" "$XDG_CONFIG_HOME/vcsh" "$XDG_CONFIG_HOME/vcsh/repo.d" +[ -z "$VCSH_BASE" ] && VCSH_BASE="$XDG_CONFIG_HOME/vcsh/repo.d" +for check_directory in "$VCSH_BASE" do if [ ! -d "$check_directory" ]; then if [ -e "$check_directory" ]; then echo "$SELF: error: $check_directory exists but is not a directory" >&2 exit 2 else - mkdir "$check_directory" || (echo "$SELF: error: could not create $check_directory" >&2; exit 2) + mkdir -p "$check_directory" || (echo "$SELF: error: could not create $check_directory" >&2; exit 2) fi fi 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 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