Add functionality to some cancel buttons

lib/util-base.sh

@@ -222,7 +222,9 @@ install_base() {
     DIALOG " Choose your initsystem " --menu "Some manjaro editions like gnome are incompatible with openrc" 0 0 2 \
       "1" "systemd" \
       "2" "openrc" 2>${INIT}
-
+    if [[ $(cat ${INIT}) == "" ]]; then
+        install_base_menu
+    fi
     if [[ $(cat ${INIT}) -eq 2 ]]; then
         touch /tmp/.openrc
         cat /usr/share/manjaro-architect/package-lists/base-openrc-manjaro > /tmp/.base
@@ -236,10 +238,12 @@ install_base() {
       $(cat /tmp/.available_kernels |awk '$0=$0" - off"') \
       "base-devel" "-" off 2>${PACKAGES}
       cat ${PACKAGES} >> /tmp/.base
-    
+    if [[ $(cat /tmp/.base) == "" ]]; then
+        install_base_menu
+    fi
     # Choose wanted kernel modules
     DIALOG " Choose additional modules for your kernels" --checklist "$_UseSpaceBar" 0 0 12 \
-      "KERNEL-headers" "-" on \
+      "KERNEL-headers" "-" off \
       "KERNEL-acpi_call" "-" on \
       "KERNEL-ndiswrapper" "-" on \
       "KERNEL-broadcom-wl" "-" off \
@@ -251,7 +255,9 @@ install_base() {
       "KERNEL-virtualbox-host-modules" "-" off \
       "KERNEL-spl" "-" off \
       "KERNEL-zfs" "-" off 2>/tmp/.modules
-
+    if [[ $(cat /tmp/.modules) == "" ]]; then
+        install_base_menu
+    fi
     for kernel in $(cat ${PACKAGES} | grep -v "base-devel") ; do
         cat /tmp/.modules | sed "s/KERNEL/\ $kernel/g" >> /tmp/.base
     done    

lib/util-desktop.sh

@@ -127,7 +127,7 @@ install_manjaro_de_wm() {
 
         if grep -q ">extra" /tmp/.edition;then
             # User to select base|extra profile
-            DIALOG "$_ExtraTitle" --menu "$_ExtraBody" 0 0 2 \
+            DIALOG "$_ExtraTitle" --no-cancel --menu "$_ExtraBody" 0 0 2 \
               "1" "full" \
               "2" "minimal" 2>/tmp/.version
 
@@ -229,12 +229,12 @@ install_manjaro_de_wm() {
             fi
 
             # Stop for a moment so user can see if there were errors
-        echo "press Enter to continue"
-        read
-        # Clear the packages file for installation of "common" packages
             echo ""
             echo ""
             echo ""
+            echo "press Enter to continue"
+            read
+            # Clear the packages file for installation of "common" packages
             echo "" > ${PACKAGES}
 
             # Offer to install various "common" packages.