vcsh: Make fatal() default to `exit 1`

[code/vcsh.git] / vcsh

diff --git a/vcsh b/vcsh
index e07cffbb5922d436c732e527cfba3f35664792b8..ea748357b20974a56e289f6e601696a113d05d02 100755 (executable)
--- a/vcsh
+++ b/vcsh
@@ -19,11 +19,12 @@
 # If '.git-HEAD' is appended to the version, you are seeing an unreleased
 # version of vcsh; the master branch is supposed to be clean at all times
 # so you can most likely just use it nonetheless
-VERSION='1.20140508'
+VERSION='1.20141009'
 SELF=$(basename $0)
 
 fatal() {
        echo "$SELF: fatal: $1" >&2
+       [ -z $2] && exit 1
        exit $2
 }
 
@@ -244,12 +245,14 @@ get_files() {
 list_tracked() {
        for VCSH_REPO_NAME in $(list); do
                get_files
-       done | sort -u
+       done | sed "s,^,$(printf '%s\n' "$VCSH_BASE/" | \
+           sed 's/[,\&]/\\&/g')," | sort -u
 }
 
 list_tracked_by() {
        use
-       git ls-files | sort -u
+       git ls-files | sed "s,^,$(printf '%s\n' "$VCSH_BASE/" | \
+           sed 's/[,\&]/\\&/g')," | sort -u
 }
 
 pull() {
@@ -349,6 +352,7 @@ use() {
 }
 
 which() {
+       [ -e "$VCSH_COMMAND_PARAMETER" ] || fatal "'$VCSH_COMMAND_PARAMETER' does not exist" 1
        for VCSH_REPO_NAME in $(list); do
                for VCSH_FILE in $(get_files); do
                        echo "$VCSH_FILE" | grep -q "$VCSH_COMMAND_PARAMETER" && echo "$VCSH_REPO_NAME: $VCSH_FILE"