diff --git a/hackshell.sh b/hackshell.sh index 4fe5992..4371499 100755 --- a/hackshell.sh +++ b/hackshell.sh @@ -639,6 +639,7 @@ bin() { a="${arch}" [ "$arch" == "x86_64" ] && arch_alt="amd64" [ "$arch" == "aarch64" ] && arch_alt="arm64" + [ -z "$arch_alt" ] && arch_alt="$arch" hs_mkxhome bin_dl() { local dst="${XHOME}/${1:?}" @@ -1044,7 +1045,7 @@ _warn_rk() { [ -n "$tainted" ] && { echo -e "${CR}Non standard LKM detected${CF} (/proc/sys/kernel/tainted=$n)" - cat "/proc/modules" 2>/dev/null | while read -r m; do + command -v modinfo >/dev/null && cat "/proc/modules" 2>/dev/null | while read -r m; do m="${m%% *}" str="$(modinfo "$m")" { [[ "$str" != *"Build time autogenerated kernel"* ]] || [[ "$str" != *"intree: Y"* ]]; } && { @@ -1215,7 +1216,7 @@ loot_cmd() { local str shift 1 - str="$("$@" 2>/dev/null)" + str="$("$@" 2>/dev/null)" || return #cmd failed [ -z "$str" ] && return echo -e "${CB}${name}${CDY}${CF}" @@ -1573,7 +1574,7 @@ cn() { x509="$(timeout "${HS_TO_OPTS[@]}" 2 openssl s_client -showcerts -connect "${1:?}:${2:-443}" 2>/dev/null /dev/null)" - [[ "$str" == "subject"* ]] && [[ "$str" != *"/CN"* ]] && { + [[ "$str" == "subject"* ]] && [[ "$str" == *"/CN"* ]] && { str="$(echo "$str" | sed '/^subject/s/^.*CN.*=[ ]*//g')" echo "$str" }