Make `vcsh list` more resilient

[code/vcsh.git] / vcsh

diff --git a/vcsh b/vcsh
index 8639095b1388452f70557317a7564b390a88fd40..c6ea395476b0759e059db930b8e5013b13acb02b 100755 (executable)
--- a/vcsh
+++ b/vcsh
@@ -22,9 +22,9 @@ help() {
 
    clone <remote> \\
          [<repo>]       Clone from an existing repository
 
    clone <remote> \\
          [<repo>]       Clone from an existing repository

-   help                 Display this help text

    delete               Delete an existing repository
    enter                Enter repository; spawn new instance of \$SHELL
    delete               Delete an existing repository
    enter                Enter repository; spawn new instance of \$SHELL

+   help                 Display this help text

    init <repo>          Initialize a new repository
    list                 List all repositories
    list-tracked         List all files tracked by vcsh
    init <repo>          Initialize a new repository
    list                 List all repositories
    list-tracked         List all files tracked by vcsh


@@ -35,6 +35,7 @@ help() {
    run <repo> \\
        <command>        Use this repository
    setup                Set up repository with recommended settings
    run <repo> \\
        <command>        Use this repository
    setup                Set up repository with recommended settings

+   which <substring>    Find substring in name of any tracked file

    write-gitignore \\
    <repo>               Write .gitignore.d/<repo> via git ls-files
 
    write-gitignore \\
    <repo>               Write .gitignore.d/<repo> via git ls-files
 


@@ -100,7 +101,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

-       rmdir "$GIT_DIR" || error "could not delete '$GIT_DIR'"
+       rm -r "$GIT_DIR" || error "could not delete '$GIT_DIR'"

 }
 
 enter() {
 }
 
 enter() {


@@ -132,8 +133,8 @@ init() {
 }
 
 list() {
 }
 
 list() {

-       for i in "$VCSH_REPO_D"/*.git; do
-               echo $(basename "$i" .git)
+       for repo in "$VCSH_REPO_D"/*.git; do
+               [ -r "$repo" ] && echo $(basename "$repo" .git)

        done
 }
 
        done
 }
 


@@ -227,7 +228,7 @@ if [ ! "x$VCSH_GITIGNORE" = 'xexact' ] && [ ! "x$VCSH_GITIGNORE" = 'xrecursive'
 fi
 
 if [ "$1" = 'clone' ]; then
 fi
 
 if [ "$1" = 'clone' ]; then

-       [ -z $2 ] && fatal "$1: please specify a remote" 1
+       [ -z "$2" ] && fatal "$1: please specify a remote" 1

        export VCSH_COMMAND="$1"
        GIT_REMOTE="$2"
        [ -n "$3" ] && VCSH_REPO_NAME="$3" || VCSH_REPO_NAME=$(basename "$GIT_REMOTE" .git)
        export VCSH_COMMAND="$1"
        GIT_REMOTE="$2"
        [ -n "$3" ] && VCSH_REPO_NAME="$3" || VCSH_REPO_NAME=$(basename "$GIT_REMOTE" .git)


@@ -297,5 +298,7 @@ done
 
 verbose "$VCSH_COMMAND begin"
 export VCSH_COMMAND=$(echo $VCSH_COMMAND | sed 's/-/_/g')
 
 verbose "$VCSH_COMMAND begin"
 export VCSH_COMMAND=$(echo $VCSH_COMMAND | sed 's/-/_/g')

+hook pre-command

 $VCSH_COMMAND
 $VCSH_COMMAND

+hook post-command

 verbose "$VCSH_COMMAND end, exiting"
 verbose "$VCSH_COMMAND end, exiting"