]> git.madduck.net Git - code/vcsh.git/commitdiff

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

Warn when source-only functions are called in executed context
authorRichard Hartmann <richih.mailinglist@gmail.com>
Tue, 22 Nov 2011 22:55:50 +0000 (23:55 +0100)
committerRichard Hartmann <richih.mailinglist@gmail.com>
Tue, 22 Nov 2011 22:55:50 +0000 (23:55 +0100)
doc/error_codes.md [new file with mode: 0644]
vcsh

diff --git a/doc/error_codes.md b/doc/error_codes.md
new file mode 100644 (file)
index 0000000..06d760d
--- /dev/null
@@ -0,0 +1,3 @@
+* 0: OK
+* 1: Generic error
+* 10: source-only command was called without vcsh being sourced
diff --git a/vcsh b/vcsh
index 6fa6644aaed8b2462fe7070f53451ae12197675b..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)
+if [ "$SELF" = 'bash' ] ||
+   [ "$SELF" = 'dash' ] ||
+   [ "$SELF" = 'sh' ] ||
+   [ "$SELF" = 'zsh' ]; then
+       SELF='vcsh'
+       VCSH_SOURCED=1
+fi
 
 
 help() {
@@ -176,6 +183,7 @@ elif [ "$VCSH_COMMAND" = 'exit' ]; then
 #              unset VCSH_NO_IGNORE_EOF
 #              setopt NO_IGNORE_EOF
 #      fi
+       [ -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
        verbose "exit end"
@@ -251,6 +259,7 @@ elif [ "$VCSH_COMMAND" = 'use' ]; then
 #              zle -N vcsh_exit
 #              bindkey '^d' 'vcsh_exit'
 #      fi
+       [ -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
        verbose "use end"