From 7c9b49eaae94849559ae47db0efc36d5e73d68c5 Mon Sep 17 00:00:00 2001
From: Bernhard Landauer <oberon@manjaro.org>
Date: Thu, 23 Feb 2017 02:00:20 +0100
Subject: [PATCH] if base not installed go to install_base_menu directly; some
 logging

---
 lib/util-base.sh |  2 +-
 lib/util.sh      | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/lib/util-base.sh b/lib/util-base.sh
index 15dd102..5b02480 100644
--- a/lib/util-base.sh
+++ b/lib/util-base.sh
@@ -337,7 +337,7 @@ uefi_bootloader() {
     if [[ $(cat ${PACKAGES}) != "" ]]; then
         clear
         basestrap ${MOUNTPOINT} $(cat ${PACKAGES} | grep -v "systemd-boot") efibootmgr dosfstools 2>$ERR
-        check_for_error "uefi_bootloader" "$?"
+        check_for_error "$FUNCNAME" "$?"
 
         case $(cat ${PACKAGES}) in
             "grub")
diff --git a/lib/util.sh b/lib/util.sh
index 0d3faf7..ac0d852 100644
--- a/lib/util.sh
+++ b/lib/util.sh
@@ -290,7 +290,7 @@ rank_mirrors() {
       "unstable" "-" off 2>${BRANCH}
     clear
     [[ ! -z "$(cat ${BRANCH})" ]] && pacman-mirrors -gib "$(cat ${BRANCH})" && \
-    check_for_error "branch selected: $(cat ${BRANCH})" "$?"
+    check_for_error "$FUNCNAME branch $(cat ${BRANCH})" "$?"
 }
 
 # Originally adapted from AIS. Added option to allow users to edit the mirrorlist.
@@ -344,7 +344,7 @@ check_mount() {
 check_base() {
     if [[ ! -e /tmp/.base_installed ]]; then
         DIALOG " $_ErrTitle " --msgbox "$_ErrNoBase" 0 0
-        main_menu_online
+        install_base_menu
     fi
 }
 
@@ -356,8 +356,8 @@ inst_needed() {
 
 # install a pkg in the chroot if not installed
 check_pkg() {
-if ! arch_chroot "pacman -Q $1" ; then
-      basestrap "$1" 2>$ERR 
-      check_for_error "install missing pkg $1 to target." "$?"
-fi
+    if ! arch_chroot "pacman -Q $1" ; then
+        basestrap "$1" 2>$ERR 
+        check_for_error "install missing pkg $1 to target." "$?"
+    fi
 }