Add more error handling

[code/vcsh.git] / vcsh

diff --git a/vcsh b/vcsh
index 7d1f5aaca2d663b25fe6aceb099d467db863d14b..3c8d0830af97c235dc1ca4cfd0f77968612cc229 100755 (executable)
--- a/vcsh
+++ b/vcsh
@@ -68,8 +68,7 @@ clone() {
 }
 
 delete() {
 }
 
 delete() {

-       old_dir="$PWD"
-       cd "$HOME"
+       cd "$HOME" || fatal "could not enter '$HOME'" 11

        use
        info "This operation WILL DETROY DATA!"
        files=$(git ls-files)
        use
        info "This operation WILL DETROY DATA!"
        files=$(git ls-files)


@@ -84,8 +83,7 @@ To continue, type \"Yes, do as I say\""
        for file in $files; do
                rm -f $file || info "could not delete '$file', continuing with deletion"
        done
        for file in $files; do
                rm -f $file || info "could not delete '$file', continuing with deletion"
        done

-       rm -rf "$GIT_DIR" || info "could not delete '$GIT_DIR'"
-       cd "$old_dir"
+       rmdir "$GIT_DIR" || error "could not delete '$GIT_DIR'"

 }
 
 enter() {
 }
 
 enter() {


@@ -100,7 +98,7 @@ git_dir_exists() {
 init() {
        [ ! -e "$GIT_DIR" ] || fatal "'$GIT_DIR' exists" 10
        export GIT_WORK_TREE="$HOME"
 init() {
        [ ! -e "$GIT_DIR" ] || fatal "'$GIT_DIR' exists" 10
        export GIT_WORK_TREE="$HOME"

-       mkdir -p "$GIT_WORK_TREE"
+       mkdir -p "$GIT_WORK_TREE" || fatal "could not create '$GIT_WORK_TREE'" 50

        cd "$GIT_WORK_TREE" || fatal "could not enter '$GIT_WORK_TREE'" 11
        git init
        setup
        cd "$GIT_WORK_TREE" || fatal "could not enter '$GIT_WORK_TREE'" 11
        git init
        setup


@@ -126,10 +124,7 @@ run() {
 
 seed_gitignore() {
        use
 
 seed_gitignore() {
        use

-       # Switching directory as this has to be executed from $HOME to be of any use.
-       # Going back into old directory at the end in case `vcsh use` is reactivated.
-       old_dir="$PWD"
-       cd "$HOME"
+       cd "$HOME" || fatal "could not enter '$HOME'" 11

        gitignores=$(for file in $(git ls-files); do
                while true; do
                        echo $file; new="${file%/*}"
        gitignores=$(for file in $(git ls-files); do
                while true; do
                        echo $file; new="${file%/*}"


@@ -138,14 +133,15 @@ seed_gitignore() {
                done;
        done | sort -u)
        tempfile=$(mktemp) || fatal "could not create tempfile" 51
                done;
        done | sort -u)
        tempfile=$(mktemp) || fatal "could not create tempfile" 51

-       echo '*' > "$tempfile"
+       echo '*' > "$tempfile" || fatal "could not write to '$tempfile'" 57

        for gitignore in $gitignores; do
        for gitignore in $gitignores; do

-               echo "$gitignore" | sed 's/^/!/' >> "$tempfile"
-               [ -d "$gitignore" ] && echo "$gitignore/*" | sed 's/^/!/'>> "$tempfile"
+               echo "$gitignore" | sed 's/^/!/' >> "$tempfile" || fatal "could not write to '$tempfile'" 57
+               [ -d "$gitignore" ] && echo "$gitignore/*" | sed 's/^/!/'>> "$tempfile" || fatal "could not write to '$tempfile'" 57

        done
        done

-       diff -N "$tempfile" "$HOME/.gitignore.d/$VCSH_REPO_NAME" > /dev/null &&
-               rm -f "$tempfile" &&
+       if [ diff -N "$tempfile" "$HOME/.gitignore.d/$VCSH_REPO_NAME" > /dev/null ]; then
+               rm -f "$tempfile" || error "could not delete '$tempfile'"

                exit
                exit

+       fi

        if [ -e "$HOME/.gitignore.d/$VCSH_REPO_NAME" ]; then
                info "'$HOME/.gitignore.d/$VCSH_REPO_NAME' differs from new data, moving it to '$HOME/.gitignore.d/$VCSH_REPO_NAME.bak'"
                mv -f "$HOME/.gitignore.d/$VCSH_REPO_NAME" "$HOME/.gitignore.d/$VCSH_REPO_NAME.bak" ||
        if [ -e "$HOME/.gitignore.d/$VCSH_REPO_NAME" ]; then
                info "'$HOME/.gitignore.d/$VCSH_REPO_NAME' differs from new data, moving it to '$HOME/.gitignore.d/$VCSH_REPO_NAME.bak'"
                mv -f "$HOME/.gitignore.d/$VCSH_REPO_NAME" "$HOME/.gitignore.d/$VCSH_REPO_NAME.bak" ||


@@ -153,7 +149,6 @@ seed_gitignore() {
        fi
        mv -f "$tempfile" "$HOME/.gitignore.d/$VCSH_REPO_NAME" ||
                fatal "could not move '$tempfile' to '$HOME/.gitignore.d/$VCSH_REPO_NAME'" 53
        fi
        mv -f "$tempfile" "$HOME/.gitignore.d/$VCSH_REPO_NAME" ||
                fatal "could not move '$tempfile' to '$HOME/.gitignore.d/$VCSH_REPO_NAME'" 53

-       cd "$old_dir"

 }
 
 setup() {
 }
 
 setup() {


@@ -161,7 +156,7 @@ setup() {
        git config core.worktree     "$GIT_WORK_TREE"
        git config core.excludesfile ".gitignore.d/$VCSH_REPO_NAME"
        git config vcsh.vcsh         'true'
        git config core.worktree     "$GIT_WORK_TREE"
        git config core.excludesfile ".gitignore.d/$VCSH_REPO_NAME"
        git config vcsh.vcsh         'true'

-       touch   "$HOME/.gitignore.d/$VCSH_REPO_NAME"
+       touch   "$HOME/.gitignore.d/$VCSH_REPO_NAME" || error "could not touch '$HOME/.gitignore.d/$VCSH_REPO_NAME'"

        git add "$HOME/.gitignore.d/$VCSH_REPO_NAME"
 }
 
        git add "$HOME/.gitignore.d/$VCSH_REPO_NAME"
 }