Add jq whiptail and to default package dependencies (#45)

* Add jq whiptail and to default dependencies * Update config.ng.functions.sh Added jq check with installation prompt, enhanced whiptail prompt with install instructions, and removed leftover line after moving checks to runtime * Update config.ng.functions.sh Refactored dependency checks to use an array for missing multiple dependencies, added combined installation prompt --------- Co-authored-by: Joey Turner <[email protected]>
armbian · Aug 30, 2024 · ffe6930 · ffe6930
1 parent ffafd60
commit ffe6930
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 5 deletions.
diff --git a/.github/workflows/debian.yml b/.github/workflows/debian.yml
@@ -21,7 +21,7 @@ jobs:
       homepage: "https://www.armbian.com"
       section: "default"
       priority: "optional"
-      depends: "bash"
+      depends: "bash jq whiptail"
       description: "Configng"
 
     secrets:

diff --git a/lib/armbian-configng/config.ng.functions.sh b/lib/armbian-configng/config.ng.functions.sh
@@ -142,8 +142,24 @@ module_options+=(
 #
 function set_runtime_variables(){
 
-    [[ -z "$DIALOG" ]] && echo "Please install whiptail" && exit 1 ;
-
+	missing_dependencies=()
+
+	# Check if whiptail is available and set DIALOG
+	if [[ -z "$DIALOG" ]]; then
+	    missing_dependencies+=("whiptail")
+	fi
+
+	# Check if jq is available
+	if ! [[ -x "$(command -v jq)" ]]; then
+	    missing_dependencies+=("jq")
+	fi
+
+	# If any dependencies are missing, print a combined message and exit
+	if [[ ${#missing_dependencies[@]} -ne 0 ]]; then
+	    echo "Error: Please install the following dependencies using 'sudo apt install ${missing_dependencies[*]}'"
+	    exit 1
+	fi
+
 	DIALOG_CANCEL=1
 	DIALOG_ESC=255
 
@@ -283,8 +299,6 @@ module_options+=(
 #
 # Function to set the tui colors
 #
-[[ -x "$(command -v whiptail)" ]] && DIALOG="whiptail" ||  exit 1 ;
-
 function set_colors() {
     local color_code=$1