Improve feedback

[code/vcsh.git] / vcsh

diff --git a/vcsh b/vcsh
index 6de5f56722277741a9caf8ade2a0e97806eb6c4d..82a98a1829cca5df22cfd88dc6cd36cc166a8f0a 100755 (executable)
--- a/vcsh
+++ b/vcsh
@@ -6,13 +6,14 @@ SELF=$(basename $0)
 
 [ -z "$XDG_CONFIG_HOME" ] && XDG_CONFIG_HOME="$HOME/.config"
 [ -z "$VCSH_BASE" ]       && VCSH_BASE="$XDG_CONFIG_HOME/vcsh/repo.d"
 
 [ -z "$XDG_CONFIG_HOME" ] && XDG_CONFIG_HOME="$HOME/.config"
 [ -z "$VCSH_BASE" ]       && VCSH_BASE="$XDG_CONFIG_HOME/vcsh/repo.d"

-for check_directory in "$VCSH_BASE"
+for check_directory in "$VCSH_BASE" "$HOME/.gitignore.d"

 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
 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

+                       echo "$SELF: info: attempting to create $check_directory"

                        mkdir -p "$check_directory" || (echo "$SELF: error: could not create $check_directory" >&2; exit 2)
                fi
        fi
                        mkdir -p "$check_directory" || (echo "$SELF: error: could not create $check_directory" >&2; exit 2)
                fi
        fi


@@ -155,7 +156,7 @@ elif [ "$1" = 'clone' ]; then
 
 elif [ "$1" = 'init' ]; then
        verbose "init begin"
 
 elif [ "$1" = 'init' ]; then
        verbose "init begin"

-       [ -z $2 ] && help && echo && echo "$SELF $1: please specify repository to work on" && return 0
+       [ -z $2 ] && help && echo && echo "$SELF $1: error: please specify repository to work on" && return 0

        export REPO_NAME="$2"
        export GIT_DIR="$VCSH_BASE/$REPO_NAME.git"
        init
        export REPO_NAME="$2"
        export GIT_DIR="$VCSH_BASE/$REPO_NAME.git"
        init


@@ -175,7 +176,7 @@ elif [ "$1" = 'init' ]; then
 
 elif [ "$1" = 'seed-gitignore' ]; then
        verbose "seed-gitignore begin"
 
 elif [ "$1" = 'seed-gitignore' ]; then
        verbose "seed-gitignore begin"

-       [ -z $2 ] && help && echo && echo "$SELF $1: please specify repository to work on" && return 0
+       [ -z $2 ] && help && echo && echo "$SELF $1: error: please specify repository to work on" && return 0

        use "$2"
        git config core.excludesfile ".gitignore.d/$REPO_NAME"
        files=$(git ls-files)
        use "$2"
        git config core.excludesfile ".gitignore.d/$REPO_NAME"
        files=$(git ls-files)


@@ -187,7 +188,7 @@ elif [ "$1" = 'seed-gitignore' ]; then
                done;
        done | sort -u | sed 's/^/!/')
        [ -e .gitignore.d/$2 ] &&
                done;
        done | sort -u | sed 's/^/!/')
        [ -e .gitignore.d/$2 ] &&

-       echo "$SELF: .gitignore.d/$2 exists, moving it to .gitignore.d/$2.bak" &&
+       echo "$SELF: info: .gitignore.d/$2 exists, moving it to .gitignore.d/$2.bak" &&

        mv -f .gitignore.d/$2 .gitignore.d/$2.bak
        echo '*' > .gitignore.d/$2
        for gitignore in $gitignores; do
        mv -f .gitignore.d/$2 .gitignore.d/$2.bak
        echo '*' > .gitignore.d/$2
        for gitignore in $gitignores; do