From 96b91e4f7b233052a1ba3ecbffd489427b008e2f Mon Sep 17 00:00:00 2001
From: Bernhard Landauer <oberon@manjaro.org>
Date: Tue, 14 Mar 2017 12:04:41 +0100
Subject: [PATCH] fix installed kernel logic;
 https://github.com/Chrysostomus/manjaro-architect/issues/115

---
 lib/util-base.sh | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/lib/util-base.sh b/lib/util-base.sh
index fd15428..00381e3 100644
--- a/lib/util-base.sh
+++ b/lib/util-base.sh
@@ -239,19 +239,13 @@ install_base() {
     if [[ $(cat ${PACKAGES}) == "" ]]; then
         # Check to see if a kernel is already installed
         ls ${MOUNTPOINT}/boot/*.img >/dev/null 2>&1
-        if [[ $? == 0 ]]; then
-            check_for_error "linux-$(ls ${MOUNTPOINT}/boot/*.img | cut -d'-' -f2) is already installed"
-            KERNEL="y"
-        else
-            for i in $(cat /tmp/.available_kernels); do
-                [[ $(cat ${PACKAGES} | grep ${i}) != "" ]] && KERNEL="y" && break;
-            done
-        fi
-        # If no kernel selected, warn and restart
-        if [[ $KERNEL == "n" ]]; then
+        if [[ $? != 0 ]]; then
             DIALOG " $_ErrTitle " --msgbox "\n$_ErrNoKernel\n " 0 0
             check_for_error "no kernel installed."
             return 0
+        else
+            DIALOG " kernel check " --msgbox "\nlinux-$(ls ${MOUNTPOINT}/boot/*.img | cut -d'-' -f2) detected \n " 0 0
+            check_for_error "linux-$(ls ${MOUNTPOINT}/boot/*.img | cut -d'-' -f2) already installed"
         fi
     else
         check_for_error "selected: $(cat ${PACKAGES})"