Use `rmdir` instead of `rm -rf`

[code/vcsh.git] / vcsh

diff --git a/vcsh b/vcsh
index 029c42c4c5f0348647c7cecb1673cb495b637a95..896cda87e74e57f51f86c08316f4655eebf25170 100755 (executable)
--- a/vcsh
+++ b/vcsh
@@ -16,6 +16,8 @@ help() {
    enter                Enter repository; spawn new $SHELL
    init <repo>          Initialize a new repository
    list                 List all repositories
    enter                Enter repository; spawn new $SHELL
    init <repo>          Initialize a new repository
    list                 List all repositories

+   rename <repo> \\
+          <newname>     Rename repository

    run <repo> \\
        <command>        Use this repository
 
    run <repo> \\
        <command>        Use this repository
 


@@ -82,7 +84,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'"
+       rmdir "$GIT_DIR" || info "could not delete '$GIT_DIR'"

        cd "$old_dir"
 }
 
        cd "$old_dir"
 }
 


@@ -91,12 +93,15 @@ enter() {
        $SHELL
 }
 
        $SHELL
 }
 

+git_dir_exists() {
+       [ -d "$GIT_DIR" ] || fatal "no repository found for '$VCSH_REPO_NAME'" 12
+}
+

 init() {
        [ ! -e "$GIT_DIR" ] || fatal "'$GIT_DIR' exists" 10
        export GIT_WORK_TREE="$HOME"
        mkdir -p "$GIT_WORK_TREE"
        cd "$GIT_WORK_TREE" || fatal "could not enter '$GIT_WORK_TREE'" 11
 init() {
        [ ! -e "$GIT_DIR" ] || fatal "'$GIT_DIR' exists" 10
        export GIT_WORK_TREE="$HOME"
        mkdir -p "$GIT_WORK_TREE"
        cd "$GIT_WORK_TREE" || fatal "could not enter '$GIT_WORK_TREE'" 11

-       cd "$GIT_WORK_TREE"

        git init
        setup
 }
        git init
        setup
 }


@@ -107,6 +112,13 @@ list() {
        done
 }
 
        done
 }
 

+rename() {
+       git_dir_exists
+       [ -d "$GIT_DIR_NEW" ] && fatal "'$GIT_DIR_NEW' exists" 54
+       mv -f "$GIT_DIR" "$GIT_DIR_NEW" || fatal "Could not mv '$GIT_DIR' '$GIT_DIR_NEW'" 52
+
+}
+

 run() {
        use
        $VCSH_EXTERNAL_COMMAND
 run() {
        use
        $VCSH_EXTERNAL_COMMAND


@@ -154,9 +166,7 @@ setup() {
 }
 
 use() {
 }
 
 use() {

-       if [ ! -d "$GIT_DIR" ]; then
-               fatal "no repository found for '$VCSH_REPO_NAME'" 12
-       fi
+       git_dir_exists

        export GIT_WORK_TREE="$(git config --get core.worktree)"
        export VCSH_DIRECTORY="$VCSH_REPO_NAME"
 }
        export GIT_WORK_TREE="$(git config --get core.worktree)"
        export VCSH_DIRECTORY="$VCSH_REPO_NAME"
 }


@@ -171,14 +181,17 @@ if [ "$1" = 'clone' ]; then
 elif [ "$1" = 'delete' ] ||
      [ "$1" = 'enter' ] ||
      [ "$1" = 'init' ] ||
 elif [ "$1" = 'delete' ] ||
      [ "$1" = 'enter' ] ||
      [ "$1" = 'init' ] ||

+     [ "$1" = 'rename' ] ||

      [ "$1" = 'run' ] ||
      [ "$1" = 'seed-gitignore' ] ||
      [ "$1" = 'setup' ]; then
      [ "$1" = 'run' ] ||
      [ "$1" = 'seed-gitignore' ] ||
      [ "$1" = 'setup' ]; then

-       [ -z $2 ] && fatal "$1: please specify repository to work on" 1
-       [ "$1" = 'run' -a -z "$3" ] && fatal "$1: please specify a command" 1
+       [ -z $2 ]                      && fatal "$1: please specify repository to work on" 1
+       [ "$1" = 'rename' -a -z "$3" ] && fatal "$1: please specify a target name" 1
+       [ "$1" = 'run' -a -z "$3" ]    && fatal "$1: please specify a command" 1

        export VCSH_COMMAND="$1"
        export VCSH_REPO_NAME="$2"
        export GIT_DIR="$VCSH_BASE/$VCSH_REPO_NAME.git"
        export VCSH_COMMAND="$1"
        export VCSH_REPO_NAME="$2"
        export GIT_DIR="$VCSH_BASE/$VCSH_REPO_NAME.git"

+       [ "$VCSH_COMMAND" = 'rename' ]         && export GIT_DIR_NEW="$VCSH_BASE/$3.git"

        [ "$VCSH_COMMAND" = 'run' ] && shift 2 && export VCSH_EXTERNAL_COMMAND="$@"
        [ "$VCSH_COMMAND" = 'seed-gitignore' ] && export VCSH_COMMAND='seed_gitignore'
 elif [ "$1" = 'list' ]; then
        [ "$VCSH_COMMAND" = 'run' ] && shift 2 && export VCSH_EXTERNAL_COMMAND="$@"
        [ "$VCSH_COMMAND" = 'seed-gitignore' ] && export VCSH_COMMAND='seed_gitignore'
 elif [ "$1" = 'list' ]; then