Merge branch 'which'

[code/vcsh.git] / vcsh

diff --git a/vcsh b/vcsh
index fef3bc8af29ca1e8124fa37e3897a85ffbdf4cbb..86e88f0ea59760abdd63bfc794d5bc77b178b14b 100755 (executable)
--- a/vcsh
+++ b/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() {


@@ -183,6 +184,14 @@ use() {
        export VCSH_DIRECTORY="$VCSH_REPO_NAME"
 }
 
        export VCSH_DIRECTORY="$VCSH_REPO_NAME"
 }
 

+which() {
+       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"
+               done
+       done | sort -u
+}
+

 write_gitignore() {
        use
        cd "$VCSH_BASE" || fatal "could not enter '$VCSH_BASE'" 11
 write_gitignore() {
        use
        cd "$VCSH_BASE" || fatal "could not enter '$VCSH_BASE'" 11


@@ -219,12 +228,17 @@ 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_REPO_NAME
        export GIT_DIR="$VCSH_REPO_D/$VCSH_REPO_NAME.git"
        export VCSH_COMMAND="$1"
        GIT_REMOTE="$2"
        [ -n "$3" ] && VCSH_REPO_NAME="$3" || VCSH_REPO_NAME=$(basename "$GIT_REMOTE" .git)
        export VCSH_REPO_NAME
        export GIT_DIR="$VCSH_REPO_D/$VCSH_REPO_NAME.git"

+elif [ "$1" = 'which' ]; then
+       [ -z "$2" ] && fatal "$1: please specify a filename" 1
+       [ -n "$3" ] && fatal "$1: too many parameters" 1
+       export VCSH_COMMAND="$1"
+       export VCSH_COMMAND_PARAMETER="$2"

 elif [ "$1" = 'delete' ]           ||
      [ "$1" = 'enter' ]            ||
      [ "$1" = 'init' ]             ||
 elif [ "$1" = 'delete' ]           ||
      [ "$1" = 'enter' ]            ||
      [ "$1" = 'init' ]             ||