From fdb2923f65f1162fa845786c74c638683d8b7531 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20K=C3=B6nig?= <ckoenig@posteo.de>
Date: Thu, 4 Nov 2021 20:25:38 +0100
Subject: [PATCH] Only change the recommendation to use apt
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Christian König <ckoenig@posteo.de>
---
 automated install/basic-install.sh | 17 +++++++++--------
 test/test_automated_install.py     |  1 -
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/automated install/basic-install.sh b/automated install/basic-install.sh
index 4634ca69..0f9f8cc0 100755
--- a/automated install/basic-install.sh	
+++ b/automated install/basic-install.sh	
@@ -266,13 +266,8 @@ if is_command apt-get ; then
     # Set some global variables here
     # We don't set them earlier since the installed package manager might be rpm, so these values would be different
     PKG_MANAGER="apt-get"
-    # A variable to store the command used to update the package cache. If apt is available use this as we have seen it
-    # gives more user-friendly (interactive) advice, else fall-back to apt-get
-    if is_command apt ; then
-        UPDATE_PKG_CACHE="apt update"
-    else
-        UPDATE_PKG_CACHE="${PKG_MANAGER} update"
-    fi
+    # A variable to store the command used to update the package cache
+    UPDATE_PKG_CACHE="${PKG_MANAGER} update"
     # The command we will use to actually install packages
     PKG_INSTALL=("${PKG_MANAGER}" -qq --no-install-recommends install)
     # grep -c will return 1 if there are no matches. This is an acceptable condition, so we OR TRUE to prevent set -e exiting the script.
@@ -1486,8 +1481,14 @@ update_package_cache() {
         printf "%b  %b %s\\n" "${OVER}" "${TICK}" "${str}"
     else
         # Otherwise, show an error and exit
+
+        # In case we used apt-get and apt is also available, we use this as recommendation as we have seen it
+        # gives more user-friendly (interactive) advice
+        if [[ ${PKG_MANAGER} == "apt-get" ]] && is_command apt ; then
+            UPDATE_PKG_CACHE="apt update"
+        fi
         printf "%b  %b %s\\n" "${OVER}" "${CROSS}" "${str}"
-        printf "  %bError: Unable to update package cache. Please try \"%s\"%b" "${COL_LIGHT_RED}" "sudo ${UPDATE_PKG_CACHE}" "${COL_NC}"
+        printf "  %bError: Unable to update package cache. Please try \"%s\"%b\\n" "${COL_LIGHT_RED}" "sudo ${UPDATE_PKG_CACHE}" "${COL_NC}"
         return 1
     fi
 }
diff --git a/test/test_automated_install.py b/test/test_automated_install.py
index 9464c984..37ebdad2 100644
--- a/test/test_automated_install.py
+++ b/test/test_automated_install.py
@@ -147,7 +147,6 @@ def test_update_package_cache_failure_no_errors(Pihole):
     '''
     confirms package cache was not updated
     '''
-    mock_command('apt', {'update': ('', '1')}, Pihole)
     mock_command('apt-get', {'update': ('', '1')}, Pihole)
     updateCache = Pihole.run('''
     source /opt/pihole/basic-install.sh