File tree Expand file tree Collapse file tree 4 files changed +14
-9
lines changed Expand file tree Collapse file tree 4 files changed +14
-9
lines changed Original file line number Diff line number Diff line change 11# HISTORY
22
3+ - v20251116
4+ - added `repl_bashsh_block`
5+ - fix ERE space
6+ - fix `which`
7+
38- v20251115
49 - added `fn_exists`
510 - added `in_vmware`
Original file line number Diff line number Diff line change 88#
99# bash.sh:
1010# Standard Template for bash/zsh developing.
11- # Version: v20251115
11+ # Version: v20251116
1212# License: MIT
1313# Site: https://github/hedzr/bash.sh
1414#
@@ -106,7 +106,7 @@ _my_main_do_sth() {
106106
107107# #######################################################
108108
109- # ### HZ Tail BEGIN #### v20251115 ####
109+ # ### HZ Tail BEGIN #### v20251116 ####
110110in_debug () { (( $DEBUG )) ; }
111111in_provisioning () { (( $PROVISIONING )) ; } # # return exit status as true if $PROVISIONING is not equal to 0
112112is_root () { [ " $( id -u) " = " 0" ]; }
@@ -739,7 +739,7 @@ main_do_sth() {
739739 fi
740740 (( ${HAS_END:- 0} )) && { debug_begin && echo -n ' Success!' && debug_end; } || return $res_ # { [ $# -eq 0 ] && :; }
741741}
742- BASH_SH_VERSION=v20251115
742+ BASH_SH_VERSION=v20251116
743743DEBUG=${DEBUG:- 0}
744744# trans_readlink() { DIR="${1%/*}" && (cd $DIR && pwd -P); }
745745# is_darwin && realpathx() { [[ $1 == /* ]] && echo "$1" || { DIR="${1%/*}" && DIR=$(cd $DIR && pwd -P) && echo "$DIR/$(basename $1)"; }; } || realpathx() { readlink -f $*; }
@@ -749,4 +749,4 @@ in_sourcing && {
749749if_vagrant && [ " $SCRIPT " == " /tmp/vagrant-shell" ] && { [ -d $CD /ops.d ] || CD=/vagrant/bin; }
750750[ -L " $SCRIPT " ] && debug linked script found && SCRIPT=$( realpathx " $SCRIPT " ) && CD=$( dirname " $SCRIPT " )
751751in_sourcing || main_do_sth " $@ "
752- # ### HZ Tail END #### v20251115 ####
752+ # ### HZ Tail END #### v20251116 ####
Original file line number Diff line number Diff line change 88#
99# bash.sh:
1010# Standard Template for bash/zsh developing.
11- # Version: v20251115
11+ # Version: v20251116
1212# License: MIT
1313# Site: https://github.com/hedzr/bash.sh
1414#
@@ -301,7 +301,7 @@ repl_bashsh_block() {
301301
302302# #######################################################
303303
304- # ### HZ Tail BEGIN #### v20251115 ####
304+ # ### HZ Tail BEGIN #### v20251116 ####
305305in_debug () { (( $DEBUG )) ; }
306306in_provisioning () { (( $PROVISIONING )) ; } # # return exit status as true if $PROVISIONING is not equal to 0
307307is_root () { [ " $( id -u) " = " 0" ]; }
@@ -1396,7 +1396,7 @@ main_do_sth() {
13961396 # disabling this logic is still simple by defining HAS_END=1.
13971397 (( ${HAS_END:- 0} )) && { debug_begin && echo -n ' Success!' && debug_end; } || return $result_code # { [ $# -eq 0 ] && :; }
13981398}
1399- BASH_SH_VERSION=v20251115
1399+ BASH_SH_VERSION=v20251116
14001400DEBUG=${DEBUG:- 0}
14011401PROVISIONING=${PROVISIONING:- 0}
14021402SUDO=sudo && [ " $( id -u) " = " 0" ] && SUDO= || :
@@ -1427,4 +1427,4 @@ path_in_orb_host "$0" && : || { [ -L "$SCRIPT" ] && debug "$(safety "linked scri
14271427# CD=$(cd `dirname "$0"`;pwd)
14281428# It will open a sub-shell to print the folder name of the running shell-script.
14291429in_sourcing && _bash_sh_load_import_files || main_do_sth " $@ "
1430- # ### HZ Tail END #### v20251115 ####
1430+ # ### HZ Tail END #### v20251116 ####
Original file line number Diff line number Diff line change @@ -32,7 +32,7 @@ tip() { printf "\e[0;38;2;133;133;133m>>> $@\e[0m\n"; }
3232wrn () { printf " \e[0;38;2;172;172;22m... [WARN] \e[0;38;2;11;11;11m$@ \e[0m\n" ; }
3333err () { printf " \e[0;33;1;133;133;133m>>> $@ \e[0m\n" 1>&2 ; }
3434fn_exists () { LC_ALL=C type $1 2> /dev/null | grep -qE ' (shell function)|(a function)' ; }
35- CD=" $( cd $( dirname " $0 " ) && pwd) " && BASH_SH_VERSION=v20251115 && DEBUG=${DEBUG:- 0} && PROVISIONING=${PROVISIONING:- 0}
35+ CD=" $( cd $( dirname " $0 " ) && pwd) " && BASH_SH_VERSION=v20251116 && DEBUG=${DEBUG:- 0} && PROVISIONING=${PROVISIONING:- 0}
3636SUDO=sudo && [ " $( id -u) " = " 0" ] && SUDO=
3737LS_OPT=" --color" && is_darwin && LS_OPT=" -G"
3838(( $# )) && {
You can’t perform that action at this time.
0 commit comments