From 1a6f442679e074beeaa8f9659175f45622995ae9 Mon Sep 17 00:00:00 2001 From: Levon Gevorgyan Date: Fri, 24 Oct 2025 20:46:04 -0500 Subject: [PATCH] small fixes --- lib/efg.sh | 1 + lib/encode.sh | 4 ++-- lib/utils.sh | 28 ++++++++++++++++++---------- 3 files changed, 21 insertions(+), 12 deletions(-) diff --git a/lib/efg.sh b/lib/efg.sh index abb4325..6ce5a56 100644 --- a/lib/efg.sh +++ b/lib/efg.sh @@ -52,6 +52,7 @@ set_efg_opts() { INPUT="${OPTARG}" ;; p) + missing_cmd gnuplot && return 1 PLOT=true ;; l) diff --git a/lib/encode.sh b/lib/encode.sh index 08a7010..8d70764 100644 --- a/lib/encode.sh +++ b/lib/encode.sh @@ -235,7 +235,7 @@ set_encode_opts() { C) if ! is_positive_integer "${OPTARG}" || test ${OPTARG} -gt 63; then echo_fail "${OPTARG} is not a valid CRF value (0-63)" - usage + encode_usage exit 1 fi CRF="${OPTARG}" @@ -278,7 +278,7 @@ set_encode_opts() { if [[ ! -f ${INPUT} ]]; then echo "${INPUT} does not exist" - efg_usage + encode_usage return 1 fi diff --git a/lib/utils.sh b/lib/utils.sh index f7a32fb..7d5fa24 100644 --- a/lib/utils.sh +++ b/lib/utils.sh @@ -103,18 +103,26 @@ dump_arr() { } has_cmd() { - local cmd="$1" - command -v "${cmd}" >/dev/null 2>&1 + local cmds=("$@") + local rv=0 + for cmd in "${cmds[@]}"; do + command -v "${cmd}" >/dev/null 2>&1 || rv=1 + done + + return ${rv} } missing_cmd() { - local cmd="$1" - rv=1 - if ! has_cmd "${cmd}"; then - echo_warn "missing ${cmd}" - rv=0 - fi - return $rv + local cmds=("$@") + local rv=1 + for cmd in "${cmds[@]}"; do + if ! has_cmd "${cmd}"; then + echo_warn "missing ${cmd}" + rv=0 + fi + done + + return ${rv} } bash_dirname() { @@ -301,4 +309,4 @@ spinner() { get_pkgconfig_version() { local pkg="$1" pkg-config --modversion "${pkg}" -} \ No newline at end of file +}