Separate package manager detection and cache update functions

Signed-off-by: Christian König <github@yubiuser.dev>

diff --git a/advanced/Scripts/update.sh b/advanced/Scripts/update.sh
index d9412f8a4038a7e147fdd95a7ab52b480db71e12..51c1b1a1de4e4967723672825b5fa53cea829624 100755 (executable)
--- a/advanced/Scripts/update.sh
+++ b/advanced/Scripts/update.sh
@@ -114,7 +114,6 @@ main() {
 
 
     # Install packages used by this installation script (necessary if users have removed e.g. git from their systems)
-    check_fresh_install
     package_manager_detect
     build_dependency_package
     install_dependent_packages

diff --git a/automated install/basic-install.sh b/automated install/basic-install.sh
index cbad9eac4b0024a32e038e47c8e48913c0fbad71..99b11d5c228a42c0291b19a1c4fb92cbf018d6d5 100755 (executable)
--- a/automated install/basic-install.sh
+++ b/automated install/basic-install.sh
@@ -254,10 +254,6 @@ package_manager_detect() {
         PKG_COUNT="${PKG_MANAGER} -s -o Debug::NoLocking=true upgrade | grep -c ^Inst || true"
         # The command we will use to remove packages (used in the uninstaller)
         PKG_REMOVE="${PKG_MANAGER} -y remove --purge"
-        # Update package cache only on fresh installs
-        if [[ "${fresh_install}" == true ]]; then
-            update_package_cache || exit 1
-        fi
 
     # If apt-get is not found, check for rpm.
     elif is_command rpm; then
@@ -2208,6 +2204,11 @@ main() {
     # Check for supported package managers so that we may install dependencies
     package_manager_detect
 
+    # Update package cache only on fresh installs and apt based systems
+    if [[ "${fresh_install}" == true ]] && is_command apt-get; then
+            update_package_cache || exit 1
+    fi
+
     # Notify user of package availability
     notify_package_updates_available
 

diff --git a/test/test_any_automated_install.py b/test/test_any_automated_install.py
index eb1f72e4bf92087066b7f0bbacda8ca7bc8964d4..cf4b454d93918ec9212ffea5ce61b9c74737d932 100644 (file)
--- a/test/test_any_automated_install.py
+++ b/test/test_any_automated_install.py
@@ -471,6 +471,7 @@ def test_package_manager_has_pihole_deps(host):
         """
     source /opt/pihole/basic-install.sh
     package_manager_detect
+    update_package_cache
     build_dependency_package
     install_dependent_packages
     """
@@ -487,6 +488,7 @@ def test_meta_package_uninstall(host):
         """
     source /opt/pihole/basic-install.sh
     package_manager_detect
+    update_package_cache
     build_dependency_package
     install_dependent_packages
     """