fix: also add explicit check for wget or curl, exit if neither of them present

This commit is contained in:
hugmouse 2024-06-19 18:04:28 +02:00
commit b1159b5b9f
No known key found for this signature in database
GPG key ID: 45FDB5FAB7ECB522

23
yabs.sh
View file

@ -20,13 +20,18 @@ echo -e '# '$YABS_VERSION' #'
echo -e '# https://github.com/masonr/yet-another-bench-script #' echo -e '# https://github.com/masonr/yet-another-bench-script #'
echo -e '# ## ## ## ## ## ## ## ## ## ## ## ## ## ## ## ## ## #' echo -e '# ## ## ## ## ## ## ## ## ## ## ## ## ## ## ## ## ## #'
# Define a function to check command availability before using it
function check_command() {
command -v "$1" &>/dev/null
}
# Check for required commands and add warnings if not available # Check for required commands and add warnings if not available
REQUIRED_COMMANDS=("locale" "uname" "getconf" "awk" "sed" "grep" "cut" "shuf" "timeout" "date" "trap" "df" "free" "systemd-detect-virt") REQUIRED_COMMANDS=("locale" "uname" "getconf" "awk" "sed" "grep" "cut" "shuf" "timeout" "date" "trap" "df" "free" "systemd-detect-virt")
echo -e "\nChecking available commands" echo -e "\nChecking available commands"
echo -e "---------------------------------" echo -e "---------------------------------"
for cmd in "${REQUIRED_COMMANDS[@]}"; do for cmd in "${REQUIRED_COMMANDS[@]}"; do
if command -v "$cmd" &>/dev/null; then if check_command "$cmd"; then
printf "%-20s : \xE2\x9C\x94 installed\n" "$cmd" printf "%-20s : \xE2\x9C\x94 installed\n" "$cmd"
else else
printf "%-20s : \xE2\x9D\x8C not installed\n" "$cmd" printf "%-20s : \xE2\x9D\x8C not installed\n" "$cmd"
@ -34,10 +39,18 @@ for cmd in "${REQUIRED_COMMANDS[@]}"; do
fi fi
done done
# Define a function to check command availability before using it # Check for curl/wget
function check_command() { if check_command "curl"; then
command -v "$1" &>/dev/null LOCAL_CURL=true
} echo -e "curl : \xE2\x9C\x94 installed"
elif check_command "wget"; then
echo -e "wget : \xE2\x9C\x94 installed"
else
echo -e "curl/wget : \xE2\x9D\x8C not installed"
echo -e "\nError: Neither 'curl' nor 'wget' command found. Please install one of those to continue."
echo -e
exit 1
fi
echo -e echo -e
if check_command "date"; then if check_command "date"; then