dietpi-globals: simplify G_WHIP_CHECKLIST_ENUM handling

Author: MichaIng

dietpi/func/dietpi-banner

@@ -877,7 +877,6 @@ $CLI_LINE"
 
 		G_WHIP_CHECKLIST_ENUM=1 # set the menu to use integer indices for the display
 		G_WHIP_CHECKLIST "Please (de)select options via spacebar to be shown in the $G_PROGRAM_NAME:" || return 0
-		G_WHIP_CHECKLIST_ENUM=0
 
 		for k in "${MENU_ITEMS[@]}"
 		do

dietpi/func/dietpi-globals

@@ -489,12 +489,12 @@ $grey─────────────────────────
 	# - G_WHIP_NOCANCEL=1		| Optional, hide the cancel button on inputbox, menu and checkbox dialogues
 	# - G_WHIP_MENU_ARRAY		| Required for G_WHIP_MENU to set available menu entries, 2 array indices per line: ('item' 'description')
 	# - G_WHIP_CHECKLIST_ARRAY	| Required for G_WHIP_CHECKLIST set available checklist options, 3 array indices per line: ('item' 'description' 'on'/'off')
-	# - G_WHIP_CHECKLIST_ENUM=1 | Optional, if set, the checklist will be displayed enumerated with numeric tags rather than the provided tags
+	# - G_WHIP_CHECKLIST_ENUM=1	| Optional, if set, the checklist will be displayed enumerated with numeric tags rather than the provided tags
 	# Output:
 	# - G_WHIP_RETURNED_VALUE 	| Returned value from inputbox/menu/checklist based whiptail items
 
 	# G_WHIP_DESTROY | Clear vars after run of whiptail
-	G_WHIP_DESTROY(){ unset -v G_WHIP_DEFAULT_ITEM G_WHIP_SIZE_X_MAX G_WHIP_BUTTON_OK_TEXT G_WHIP_BUTTON_CANCEL_TEXT G_WHIP_NOCANCEL G_WHIP_MENU_ARRAY G_WHIP_CHECKLIST_ARRAY G_WHIP_INPUTBOX_REGEX G_WHIP_INPUTBOX_REGEX_TEXT; }
+	G_WHIP_DESTROY(){ unset -v G_WHIP_DEFAULT_ITEM G_WHIP_SIZE_X_MAX G_WHIP_BUTTON_OK_TEXT G_WHIP_BUTTON_CANCEL_TEXT G_WHIP_NOCANCEL G_WHIP_MENU_ARRAY G_WHIP_CHECKLIST_ARRAY G_WHIP_INPUTBOX_REGEX G_WHIP_INPUTBOX_REGEX_TEXT G_WHIP_CHECKLIST_ENUM; }
 
 	# Run once, to be failsafe in case any exported/environment variables are left from originating shell
 	G_WHIP_DESTROY
@@ -835,7 +835,7 @@ $grey─────────────────────────
 	# G_WHIP_CHECKLIST "message"
 	# - Prompt user to select multiple options from G_WHIP_CHECKLIST_ARRAY and save choice to G_WHIP_RETURNED_VALUE
 	# - Exit code: 0=selection done, else=user cancelled or noninteractive
-	# - G_WHIP_CHECKLIST_ENUM=1 | Optional, if set, the checklist will be displayed enumerated with numeric tags rather than the provided tags
+	# - G_WHIP_CHECKLIST_ENUM=1: Optional, if set, the checklist will be displayed enumerated with numeric tags rather than the provided tags
 	G_WHIP_CHECKLIST()
 	{
 		local result=1
@@ -847,45 +847,33 @@ $grey─────────────────────────
 			[[ $G_WHIP_NOCANCEL == 1 ]] && NOCANCEL=('--nocancel')
 			G_WHIP_BUTTON_OK_TEXT=${G_WHIP_BUTTON_OK_TEXT:-Confirm}
 
-			# Places to save original checklist and default
-			local orig_checklist=() original_default_item="$G_WHIP_DEFAULT_ITEM"
-
-			####
-			# If G_WHIP_CHECKLIST_ENUM=1, the checklist will be enumerated with numeric tags for whiptail,
-			# while preserving the original tags for mapping backwards after the checklist selection.
-			if [[ ${G_WHIP_CHECKLIST_ENUM:-0} == 1 && ${#G_WHIP_CHECKLIST_ARRAY[@]} -gt 0 ]]
+			# If G_WHIP_CHECKLIST_ENUM=1 is set, map and replace original tags and default with numeric ones
+			if (( $G_WHIP_CHECKLIST_ENUM ))
 			then
-				# save the original checklist
-				orig_checklist=("${G_WHIP_CHECKLIST_ARRAY[@]}")
-
-				# Build numeric-tagged checklist for whiptail while preserving original tags
-				local -a __tmp=() __idx=0 __map=()
-				for ((i=0;i<${#orig_checklist[@]};i+=3)); do
-					__map[$__idx]="${orig_checklist[$i]}"
-					__tmp+=("$__idx" "${orig_checklist[$i+1]}" "${orig_checklist[$i+2]}")
-					[[ -n "$original_default_item" && "$original_default_item" == "${orig_checklist[$i]}" ]] && G_WHIP_DEFAULT_ITEM=$__idx
-					((__idx++))
+				local map=() idx=0
+				for ((i=0;i<${#G_WHIP_CHECKLIST_ARRAY[@]};i+=3))
+				do
+					[[ $G_WHIP_DEFAULT_ITEM == "${G_WHIP_CHECKLIST_ARRAY[$i]}" ]] && G_WHIP_DEFAULT_ITEM=$idx
+					map[$idx]=${G_WHIP_CHECKLIST_ARRAY[$i]}
+					G_WHIP_CHECKLIST_ARRAY[$i]=$idx
+					((idx++))
 				done
-				G_WHIP_CHECKLIST_ARRAY=("${__tmp[@]}")
 			fi
 
 			G_WHIP_INIT 3
 			# shellcheck disable=SC2086
 			G_WHIP_RETURNED_VALUE=$(whiptail ${G_PROGRAM_NAME:+--title "$G_PROGRAM_NAME"} --backtitle "$WHIP_BACKTITLE | Use spacebar to toggle selection" --checklist "$WHIP_MESSAGE" --separate-output --ok-button "$G_WHIP_BUTTON_OK_TEXT" --cancel-button "$G_WHIP_BUTTON_CANCEL_TEXT" "${NOCANCEL[@]}" --default-item "$G_WHIP_DEFAULT_ITEM" $WHIP_SCROLLTEXT "$WHIP_SIZE_Y" "$WHIP_SIZE_X" "$WHIP_SIZE_Z" -- "${G_WHIP_CHECKLIST_ARRAY[@]}" 3>&1 1>&2 2>&3-)
 			result=$?
 
-			# If enumeration was used, map numeric selections back to original tags
-			if [[ ${G_WHIP_CHECKLIST_ENUM:-0} == 1 && ${#orig_checklist[@]} -gt 0 && -n "$G_WHIP_RETURNED_VALUE" ]]
+			# If G_WHIP_CHECKLIST_ENUM=1 is set, replace numeric selections back to original tags
+			if (( $G_WHIP_CHECKLIST_ENUM ))
 			then
-				local sel mapped=()
-				for sel in $G_WHIP_RETURNED_VALUE; do
-					mapped+=("${__map[$sel]}")
+				local mapped=()
+				for idx in $G_WHIP_RETURNED_VALUE
+				do
+					mapped+=("${map[$idx]}")
 				done
-				G_WHIP_RETURNED_VALUE="${mapped[*]}"
-				# restore originals
-				G_WHIP_CHECKLIST_ARRAY=("${orig_checklist[@]}")
-				G_WHIP_DEFAULT_ITEM="$original_default_item"
-				unset -v __map __tmp __idx sel mapped
+				G_WHIP_RETURNED_VALUE=${mapped[*]}
 			fi
 
 			G_WHIP_RETURNED_VALUE=$(echo -e "$G_WHIP_RETURNED_VALUE" | tr '\n' ' ')