improved detector for CD & SCRIPT

Author: hedzr

bash.sh

@@ -306,10 +306,10 @@ else
 	alias is_ttya=false
 fi
 cmd_exists() { command -v $1 >/dev/null; } # it detects any builtin or external commands, aliases, and any functions
-fn_exists() { LC_ALL=C type $1 2>/dev/null | grep -qE '(shell function)|(a function)'; }
-fn_builtin_exists() { LC_ALL=C type $1 2>/dev/null | grep -q 'shell builtin'; }
+fn_exists() { LC_ALL=C type $1 2>/dev/null | grep -qE '( shell function)|( a function)'; }
+fn_builtin_exists() { LC_ALL=C type $1 2>/dev/null | grep -q ' shell builtin'; }
 if is_zsh_strict; then
-	fn_aliased_exists() { LC_ALL=C type $1 2>/dev/null | grep -qE '(alias for)|(aliased to)'; }
+	fn_aliased_exists() { LC_ALL=C type $1 2>/dev/null | grep -qE '(alias for )|(aliased to )'; }
 else
 	fn_aliased_exists() { LC_ALL=C alias $1 1>/dev/null 2>&1; }
 fi
@@ -1368,11 +1368,11 @@ alias list-all-env-variables=list_all_env_variables list-all-variables=list_all_
 # trans_readlink() { DIR="${1%/*}" && (cd $DIR && pwd -P); }
 # is_darwin && realpathx() { [[ $1 == /* ]] && echo "$1" || { DIR="${1%/*}" && DIR=$(cd $DIR && pwd -P) && echo "$DIR/$(basename $1)"; }; } || realpathx() { readlink -f $*; }
 in_sourcing && {
-	SCRIPT=$(realpathx $(is_zsh_strict && echo "$0" || echo "$BASH_SOURCE")) && CD=$(dirname "$SCRIPT") && debug "$(safety ">> IN SOURCING (DEBUG=$DEBUG), \$0=$0, \$_=$_")"
+	SCRIPT=$(realpathx $(is_zsh_strict && echo "$0" || { [ "$BASH_SOURCE" != "" ] && echo "$BASH_SOURCE" || echo "$0"; })) && CD=$(dirname "$SCRIPT") && debug "$(safety ">> IN SOURCING (DEBUG=$DEBUG), \$0=$0, \$_=$_")"
 } || {
 	path_in_orb_host "$0" && SCRIPT="$0" || SCRIPT=$(realpathx "$0")
 	CD=$(dirname "$SCRIPT") && debug "$(safety ">> '$SCRIPT' in '$CD', \$0='$0','$1'.")"
-}
+} || CD="$(cd $(dirname "$0") && pwd)"
 if_vagrant && [ "$SCRIPT" == "/tmp/vagrant-shell" ] && { [ -d "$CD/ops.d" ] || CD=/vagrant/bin; }
 path_in_orb_host "$0" && : || { [ -L "$SCRIPT" ] && debug "$(safety "linked script found")" && SCRIPT="$(realpathx "$SCRIPT")" && CD="$(dirname "$SCRIPT")"; }
 # The better consice way to get baseDir, ie. $CD, is: