Better debugging

* Start debugging as early as possible
* Always print version if run with debugging or verbose enabled

diff --git a/vcsh b/vcsh
index cf85e7c1a47ccb00dcba5898d83386bd860fc437..22b4a70142cb08cffb8fc183638029e6375220a8 100755 (executable)
--- a/vcsh
+++ b/vcsh
@@ -12,6 +12,9 @@
 # which is admittedly extremely unlikely to the point of being impossible,
 # this software will most likely follow suit.
 
 # which is admittedly extremely unlikely to the point of being impossible,
 # this software will most likely follow suit.
 

+# This should always be the first line of code to facilitate debugging
+[ -n "$VCSH_DEBUG" ] && set -vx
+

 basename() {
        # Implemented in shell to avoid spawning another process
        local file
 basename() {
        # Implemented in shell to avoid spawning another process
        local file


@@ -35,8 +38,10 @@ while getopts "c:dv" flag; do
        if [ "$1" = '-d' ] || [ "$1" = '--debug' ]; then
                set -vx
                VCSH_DEBUG=1
        if [ "$1" = '-d' ] || [ "$1" = '--debug' ]; then
                set -vx
                VCSH_DEBUG=1

+               echo "$SELF $VERSION"

        elif [ "$1" = '-v' ];then
                VCSH_VERBOSE=1
        elif [ "$1" = '-v' ];then
                VCSH_VERBOSE=1

+               echo "$SELF $VERSION"

        elif [ "$1" = '-c' ];then
                VCSH_OPTION_CONFIG=$OPTARG
        fi
        elif [ "$1" = '-c' ];then
                VCSH_OPTION_CONFIG=$OPTARG
        fi