Warn when source-only functions are called in executed context

[code/vcsh.git] / vcsh

diff --git a/vcsh b/vcsh
index daf8893cc0ad617b27b69b3e8e509627c2041361..4ba30e53e7e3635406782fdbdd6677c1636e4ac0 100755 (executable)
--- a/vcsh
+++ b/vcsh
@@ -5,6 +5,13 @@
 [ -z "$VCSH_BASE" ]       && VCSH_BASE="$XDG_CONFIG_HOME/vcsh/repo.d"
 
 SELF=$(basename $0)
 [ -z "$VCSH_BASE" ]       && VCSH_BASE="$XDG_CONFIG_HOME/vcsh/repo.d"
 
 SELF=$(basename $0)

+if [ "$SELF" = 'bash' ] ||
+   [ "$SELF" = 'dash' ] ||
+   [ "$SELF" = 'sh' ] ||
+   [ "$SELF" = 'zsh' ]; then
+       SELF='vcsh'
+       VCSH_SOURCED=1
+fi

 
 
 help() {
 
 
 help() {


@@ -14,19 +21,18 @@ help() {
          [<repo>]       Clone from an existing repository
    help                 Display this help text
    delete               Delete an existing repository
          [<repo>]       Clone from an existing repository
    help                 Display this help text
    delete               Delete an existing repository

+   exit                 Exit repository; unset ENV

    init <repo>          Initialize a new repository
    init <repo>          Initialize a new repository

-   list                 List all repos
+   list                 List all repositories

    run <repo> \\
        <command>        Use this repository
 
    seed-gitignore \\
    <repo>               Seed .gitignore.d/<repo> from git ls-files
    run <repo> \\
        <command>        Use this repository
 
    seed-gitignore \\
    <repo>               Seed .gitignore.d/<repo> from git ls-files

+   use <repo>           Use repository; set ENV

 
    <repo> <git command> Special command that allows you to run git commands
                         directly without having to type so much ;)" >&2
 
    <repo> <git command> Special command that allows you to run git commands
                         directly without having to type so much ;)" >&2

-#   use <repo>     Use this repository
-#
-#   exit              Exit vcsh mode" >&2

 }
 
 debug() {
 }
 
 debug() {


@@ -85,7 +91,8 @@ if [ "$1" = 'clone' ]; then
 elif [ "$1" = 'delete' ] ||
      [ "$1" = 'init' ] ||
      [ "$1" = 'run' ] ||
 elif [ "$1" = 'delete' ] ||
      [ "$1" = 'init' ] ||
      [ "$1" = 'run' ] ||

-     [ "$1" = 'seed-gitignore' ]; then
+     [ "$1" = 'seed-gitignore' ] ||
+     [ "$1" = 'use' ]; then

        [ -z $2 ] && echo "$SELF $1: error: please specify repository to work on" && return 1
        export VCSH_COMMAND="$1"
        export VCSH_REPO_NAME="$2"
        [ -z $2 ] && echo "$SELF $1: error: please specify repository to work on" && return 1
        export VCSH_COMMAND="$1"
        export VCSH_REPO_NAME="$2"


@@ -95,7 +102,8 @@ elif [ "$1" = 'delete' ] ||
        if [ "$VCSH_COMMAND" = 'run' ]; then
                [ -z "$VCSH_EXTERNAL_COMMAND" ] && echo "$SELF $1 $2: error: please specify a command" && return 1
        fi
        if [ "$VCSH_COMMAND" = 'run' ]; then
                [ -z "$VCSH_EXTERNAL_COMMAND" ] && echo "$SELF $1 $2: error: please specify a command" && return 1
        fi

-elif [ "$1" = 'help' ] ||
+elif [ "$1" = 'exit' ] ||
+     [ "$1" = 'help' ] ||

      [ "$1" = 'list' ]; then
        export VCSH_COMMAND="$1"
 else
      [ "$1" = 'list' ]; then
        export VCSH_COMMAND="$1"
 else


@@ -169,16 +177,17 @@ To continue, type \"Yes, do as I say\""
        cd "$old_dir"
        verbose "delete end"
 
        cd "$old_dir"
        verbose "delete end"
 

-#elif [ "$VCSH_COMMAND" = 'exit' ]; then
-#      verbose "exit begin"
+elif [ "$VCSH_COMMAND" = 'exit' ]; then
+       verbose "exit begin"

 #      if [ -n "$ZSH_VERSION" ] && [ "$VCSH_NO_IGNORE_EOF" = '1' ]; then
 #              unset VCSH_NO_IGNORE_EOF
 #              setopt NO_IGNORE_EOF
 #      fi
 #      if [ -n "$ZSH_VERSION" ] && [ "$VCSH_NO_IGNORE_EOF" = '1' ]; then
 #              unset VCSH_NO_IGNORE_EOF
 #              setopt NO_IGNORE_EOF
 #      fi

-#      leave
+       [ -z "$VCSH_SOURCED" ] && echo "$SELF $VCSH_COMMAND: You need to source vcsh if you want to run in this mode" && return 10
+       leave

 #      [ -n "$ZSH_VERSION" ] && [ "$USER" = richih ] && buildPS1
 #      [ -n "$ZSH_VERSION" ] && [ "$USER" = richih ] && buildPS1

-#      verbose "exit end"
-#      exit 0
+       verbose "exit end"
+       return 0

 
 elif [ "$VCSH_COMMAND" = 'init' ]; then
        verbose "init begin"
 
 elif [ "$VCSH_COMMAND" = 'init' ]; then
        verbose "init begin"


@@ -236,8 +245,8 @@ elif [ "$VCSH_COMMAND" = 'seed-gitignore' ]; then
        cd "$old_dir"
        verbose "seed-gitignore end"
 
        cd "$old_dir"
        verbose "seed-gitignore end"
 

-#elif [ "$VCSH_COMMAND" = 'use' ]; then
-#      verbose "use begin"
+elif [ "$VCSH_COMMAND" = 'use' ]; then
+       verbose "use begin"

 #      if [ -n "$ZSH_VERSION" ]; then
 #              if [ -o NO_IGNORE_EOF ]; then
 #                      export VCSH_NO_IGNORE_EOF=1
 #      if [ -n "$ZSH_VERSION" ]; then
 #              if [ -o NO_IGNORE_EOF ]; then
 #                      export VCSH_NO_IGNORE_EOF=1


@@ -250,9 +259,10 @@ elif [ "$VCSH_COMMAND" = 'seed-gitignore' ]; then
 #              zle -N vcsh_exit
 #              bindkey '^d' 'vcsh_exit'
 #      fi
 #              zle -N vcsh_exit
 #              bindkey '^d' 'vcsh_exit'
 #      fi

-#      use || return $?
+       [ -z "$VCSH_SOURCED" ] && echo "$SELF $VCSH_COMMAND: You need to source vcsh if you want to run in this mode" && return 10
+       use || return $?

 #      [ -n "$ZSH_VERSION" ] && [ "$USER" = richih ] && buildPS1
 #      [ -n "$ZSH_VERSION" ] && [ "$USER" = richih ] && buildPS1

-#      verbose "use end"
+       verbose "use end"

 
 else
        verbose "defaulting to calling help()"
 
 else
        verbose "defaulting to calling help()"