ssubmenus

lib/util-advanced.sh

@@ -102,8 +102,8 @@ install_vanilla_de_wm() {
     local PARENT="$FUNCNAME"
     declare -i loopmenu=1
     while ((loopmenu)); do
-        submenu 7
-        DIALOG " $_InstGrMenuTitle " --default-item ${HIGHLIGHT_SUB} \
+        ssubmenu 7
+        DIALOG " $_InstGrMenuTitle " --default-item ${HIGHLIGHT_SSUB} \
           --menu "\n$_InstGrMenuBody\n " 0 0 7 \
           "1" "$_InstGrMenuDS" \
           "2" "$_InstGrDE" \
@@ -112,7 +112,7 @@ install_vanilla_de_wm() {
           "5" "$_InstMultMenuTitle|>" \
           "6" "$_InstMulCust" \
           "7" "$_Back" 2>${ANSWER}
-        HIGHLIGHT_SUB=$(cat ${ANSWER})
+        HIGHLIGHT_SSUB=$(cat ${ANSWER})
 
         case $(cat ${ANSWER}) in
             "1") install_xorg_input
@@ -586,15 +586,14 @@ security_menu() {
     declare -i loopmenu=1
     while ((loopmenu)); do
         local PARENT="$FUNCNAME"
-
-        submenu 4
-        DIALOG " $_SecMenuTitle " --default-item ${HIGHLIGHT_SUB} --menu "\n$_SecMenuBody\n " 0 0 4 \
+        ssubmenu 4
+        DIALOG " $_SecMenuTitle " --default-item ${HIGHLIGHT_SSUB} --menu "\n$_SecMenuBody\n " 0 0 4 \
           "1" "$_SecJournTitle" \
           "2" "$_SecCoreTitle" \
           "3" "$_SecKernTitle " \
           "4" "$_Back" 2>${ANSWER}
+        HIGHLIGHT_SSUB=$(cat ${ANSWER})
 
-        HIGHLIGHT_SUB=$(cat ${ANSWER})
         case $(cat ${ANSWER}) in
             # systemd-journald
             "1") DIALOG " $_SecJournTitle " --menu "\n$_SecJournBody\n " 0 0 7 \

lib/util-config.sh

@@ -142,11 +142,11 @@ edit_configs() {
     shopt -u nullglob
  
     while ((1)); do
-        submenu 13
-        DIALOG " $_SeeConfOptTitle " --default-item ${HIGHLIGHT_SUB} --menu "\n$_SeeConfOptBody\n " 0 0 $i \
+        ssubmenu 13
+        DIALOG " $_SeeConfOptTitle " --default-item ${HIGHLIGHT_SSUB} --menu "\n$_SeeConfOptBody\n " 0 0 $i \
             "${options[@]}" 2>${ANSWER}
-        HIGHLIGHT_SUB=$(<${ANSWER})
-        choice="${HIGHLIGHT_SUB:-0}"
+        HIGHLIGHT_SSUB=$(<${ANSWER})
+        choice="${HIGHLIGHT_SSUB:-0}"
 
         case "$choice" in
             0) break ;;                      # btn cancel

lib/util-menu.sh

@@ -400,8 +400,8 @@ config_cli_base_menu() {
     local PARENT="$FUNCNAME"
     declare -i loopmenu=1
     while ((loopmenu)); do
-        submenu 7
-        DIALOG " $_ConfBseMenuTitle " --default-item ${HIGHLIGHT_SUB} --menu "\n$_ConfBseBody\n " 0 0 7 \
+        ssubmenu 7
+        DIALOG " $_ConfBseMenuTitle " --default-item ${HIGHLIGHT_SSUB} --menu "\n$_ConfBseBody\n " 0 0 7 \
           "1" "$_ConfBseFstab" \
           "2" "$_ConfBseHost" \
           "3" "$_ConfBseSysLoc" \
@@ -409,7 +409,7 @@ config_cli_base_menu() {
           "5" "$_ConfUsrRoot" \
           "6" "$_ConfUsrNew" \
           "7" "$_Back" 2>${ANSWER}
-        HIGHLIGHT_SUB=$(cat ${ANSWER})
+        HIGHLIGHT_SSUB=$(cat ${ANSWER})
 
         case $(cat ${ANSWER}) in
             "1") generate_fstab
@@ -432,23 +432,22 @@ config_cli_base_menu() {
 }
 
 install_drivers_menu() {
-    HIGHLIGHT_SUB=1
+    local PARENT="$FUNCNAME"
     declare -i loopmenu=1
     while ((loopmenu)); do
+        ssubmenu 3
         DIALOG " $_InstDrvTitle " --default-item ${HIGHLIGHT_SUB} --menu "\n " 0 0 3 \
           "1" "$_InstGrMenuDD|>" \
           "2" "$_InstNWDrv|>" \
           "3" "$_Back" 2>${ANSWER}
+        HIGHLIGHT_SSUB=$(cat ${ANSWER})
 
         case $(cat ${ANSWER}) in
             "1") install_graphics_menu
-                HIGHLIGHT_SUB=2
                 ;;
             "2") setup_network_drivers || DIALOG " $_InstBseTitle " --infobox "\n$_InstFail\n " 0 0
-                HIGHLIGHT_SUB=3
                 ;;
-            *) HIGHLIGHT_SUB=5
-                loopmenu=0
+            *) loopmenu=0
                 return 0
                 ;;
         esac