check_base before bootloader, highlight inst_base

lib/util-base.sh

@@ -134,13 +134,14 @@ install_base() {
 }
 
 install_bootloader() {
-    check_base && {
+    if check_base; then
         if [[ $SYSTEM == "BIOS" ]]; then
             bios_bootloader
         else
             uefi_bootloader
         fi
-    }
+    else
+        HIGHLIGHT_SUB=2
 }
 
 uefi_bootloader() {

lib/util.sh

@@ -361,26 +361,20 @@ arch_chroot() {
 check_mount() {
     if [[ $(lsblk -o MOUNTPOINT | grep ${MOUNTPOINT}) == "" ]]; then
         DIALOG " $_ErrTitle " --msgbox "$_ErrNoMount" 0 0
-        ANSWER=0
         HIGHLIGHT=0
         return 1
-    else
-        return 0
     fi
 }
 
 # Ensure that Manjaro has been installed
 check_base() {
-    check_mount && {
+    if check_mount; then
-    if [[ ! -e /mnt/.base_installed ]]; then
+        if [[ ! -e /mnt/.base_installed ]]; then
-        DIALOG " $_ErrTitle " --msgbox "$_ErrNoBase" 0 0
+            DIALOG " $_ErrTitle " --msgbox "$_ErrNoBase" 0 0
-        ANSWER=1
+            HIGHLIGHT=1
-        HIGHLIGHT=1
+            return 1
-        return 1
+        fi
-    else
-        return 0
     fi
-    }
 }
 
 # install a pkg in the live session if not installed