Skip to content

Commit 2857066

Browse files
committed
bump to v20251115
- added `fn_exists` - added `in_vmware` - fix `is_apt`, `is_dnf`, ... - improved `i386_amd64` - fix `which` - added `ask_yesno`, `ask_yesno_timeout` to more.sh
1 parent 7b6f93c commit 2857066

File tree

4 files changed

+17
-9
lines changed

4 files changed

+17
-9
lines changed

CHANGELOG

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
11
# HISTORY
22

3+
- v20251115
4+
- added `fn_exists`
5+
- added `in_vmware`
6+
- fix `is_apt`, `is_dnf`, ...
7+
- improved `i386_amd64`
8+
- fix `which`
9+
- added `ask_yesno`, `ask_yesno_timeout` to more.sh
10+
311
- v20250815
412
- improved detector for CD & SCRIPT
513
- improved simple-entry.sh

bash-lite.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#
99
# bash.sh:
1010
# Standard Template for bash/zsh developing.
11-
# Version: v20250815
11+
# Version: v20251115
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 #### v20250815 ####
109+
#### HZ Tail BEGIN #### v20251115 ####
110110
in_debug() { (($DEBUG)); }
111111
in_provisioning() { (($PROVISIONING)); } ## return exit status as true if $PROVISIONING is not equal to 0
112112
is_root() { [ "$(id -u)" = "0" ]; }
@@ -733,7 +733,7 @@ main_do_sth() {
733733
fi
734734
((${HAS_END:-0})) && { debug_begin && echo -n 'Success!' && debug_end; } || return $res_ # { [ $# -eq 0 ] && :; }
735735
}
736-
BASH_SH_VERSION=v20250815
736+
BASH_SH_VERSION=v20251115
737737
DEBUG=${DEBUG:-0}
738738
# trans_readlink() { DIR="${1%/*}" && (cd $DIR && pwd -P); }
739739
# is_darwin && realpathx() { [[ $1 == /* ]] && echo "$1" || { DIR="${1%/*}" && DIR=$(cd $DIR && pwd -P) && echo "$DIR/$(basename $1)"; }; } || realpathx() { readlink -f $*; }
@@ -743,4 +743,4 @@ in_sourcing && {
743743
if_vagrant && [ "$SCRIPT" == "/tmp/vagrant-shell" ] && { [ -d $CD/ops.d ] || CD=/vagrant/bin; }
744744
[ -L "$SCRIPT" ] && debug linked script found && SCRIPT=$(realpathx "$SCRIPT") && CD=$(dirname "$SCRIPT")
745745
in_sourcing || main_do_sth "$@"
746-
#### HZ Tail END #### v20250815 ####
746+
#### HZ Tail END #### v20251115 ####

bash.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#
99
# bash.sh:
1010
# Standard Template for bash/zsh developing.
11-
# Version: v20250815
11+
# Version: v20251115
1212
# License: MIT
1313
# Site: https://github.com/hedzr/bash.sh
1414
#
@@ -257,7 +257,7 @@ _bash_sh_load_env_files() {
257257

258258
########################################################
259259

260-
#### HZ Tail BEGIN #### v20250815 ####
260+
#### HZ Tail BEGIN #### v20251115 ####
261261
in_debug() { (($DEBUG)); }
262262
in_provisioning() { (($PROVISIONING)); } ## return exit status as true if $PROVISIONING is not equal to 0
263263
is_root() { [ "$(id -u)" = "0" ]; }
@@ -1351,7 +1351,7 @@ main_do_sth() {
13511351
# disabling this logic is still simple by defining HAS_END=1.
13521352
((${HAS_END:-0})) && { debug_begin && echo -n 'Success!' && debug_end; } || return $result_code # { [ $# -eq 0 ] && :; }
13531353
}
1354-
BASH_SH_VERSION=v20250815
1354+
BASH_SH_VERSION=v20251115
13551355
DEBUG=${DEBUG:-0}
13561356
PROVISIONING=${PROVISIONING:-0}
13571357
SUDO=sudo && [ "$(id -u)" = "0" ] && SUDO= || :
@@ -1382,4 +1382,4 @@ path_in_orb_host "$0" && : || { [ -L "$SCRIPT" ] && debug "$(safety "linked scri
13821382
# CD=$(cd `dirname "$0"`;pwd)
13831383
# It will open a sub-shell to print the folder name of the running shell-script.
13841384
in_sourcing && _bash_sh_load_import_files || main_do_sth "$@"
1385-
#### HZ Tail END #### v20250815 ####
1385+
#### HZ Tail END #### v20251115 ####

simple-entry.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ tip() { printf "\e[0;38;2;133;133;133m>>> $@\e[0m\n"; }
3232
wrn() { printf "\e[0;38;2;172;172;22m... [WARN] \e[0;38;2;11;11;11m$@\e[0m\n"; }
3333
err() { printf "\e[0;33;1;133;133;133m>>> $@\e[0m\n" 1>&2; }
3434
fn_exists() { LC_ALL=C type $1 2>/dev/null | grep -qE '(shell function)|(a function)'; }
35-
CD="$(cd $(dirname "$0") && pwd)" && BASH_SH_VERSION=v20250815 && DEBUG=${DEBUG:-0} && PROVISIONING=${PROVISIONING:-0}
35+
CD="$(cd $(dirname "$0") && pwd)" && BASH_SH_VERSION=v20251115 && DEBUG=${DEBUG:-0} && PROVISIONING=${PROVISIONING:-0}
3636
SUDO=sudo && [ "$(id -u)" = "0" ] && SUDO=
3737
LS_OPT="--color" && is_darwin && LS_OPT="-G"
3838
(($#)) && {

0 commit comments

Comments
 (0)