jinql
/
bashtop
mirror of https://github.com/aristocratos/bashtop
1
0
Fork 0
Code Issues Releases Wiki Activity

moved os check to not init config before check, optimized bash check

pull/68/head
aristocratos 2020-04-28 18:05:50 +02:00
parent 4fd84d0510
commit d8a280d76c
1 changed files with 14 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
bashtop
View File

@ -30,19 +30,26 @@
declare -x LC_MESSAGES="C" LC_NUMERIC="C" LC_ALL="" declare -x LC_MESSAGES="C" LC_NUMERIC="C" LC_ALL=""
#* Fail if running on unsupported OS
case "$(uname -s)" in
Linux*) system=Linux;;
Darwin*) system=MacOS;;
CYGWIN*) system=Cygwin;;
MINGW*) system=MinGw;;
*) system="Other"
esac
if [[ "$system" != "Linux" ]]; then
echo "This version of bashtop does not support $system platform."
exit 1
fi
#* Fail if Bash version is below 4.4 #* Fail if Bash version is below 4.4
bash_version_major="$(echo $BASH_VERSION | cut -d "." -f 1)" bash_version_major="$(echo $BASH_VERSION | cut -d "." -f 1)"
bash_version_minor="$(echo $BASH_VERSION | cut -d "." -f 2)" bash_version_minor="$(echo $BASH_VERSION | cut -d "." -f 2)"
if [[ "$bash_version_major" -lt 4 ]]; then if [[ "$bash_version_major" -lt 4 ]] || [[ "$bash_version_major" == 4 && "$bash_version_minor" -lt 4 ]]; then
echo "ERROR: Bash 4.4 or later is required (you are using Bash $bash_version_major.$bash_version_minor)." echo "ERROR: Bash 4.4 or later is required (you are using Bash $bash_version_major.$bash_version_minor)."
echo " Consider upgrading your distribution to get a more recent Bash version." echo " Consider upgrading your distribution to get a more recent Bash version."
exit 1 exit 1
else
if [[ "$bash_version_major" == 4 && "$bash_version_minor" -lt 4 ]]; then
echo "ERROR: Bash 4.4 or later is required (you are using Bash $bash_version_major.$bash_version_minor)."
echo " Consider upgrading your distribution to get a more recent Bash version."
exit 1
fi
fi fi
shopt -qu failglob nullglob shopt -qu failglob nullglob
@ -189,24 +196,7 @@ else
} }
fi fi
system_check_() {
local system
case "$(uname -s)" in
Linux*) system=Linux;;
Darwin*) system=MacOS;;
CYGWIN*) system=Cygwin;;
MINGW*) system=MinGw;;
*) system="Other"
esac
if [[ "$system" != "Linux" ]]; then
echo "This tool does not support $system platform."
exit 1
fi
}
init_() { #? Collect needed information and set options before startig main loop init_() { #? Collect needed information and set options before startig main loop
system_check_
local i local i
#* Set terminal options, save and clear screen #* Set terminal options, save and clear screen
tput smcup tput smcup