From 28be9a7f311a3f1e8551442a35fa77ac05e186b1 Mon Sep 17 00:00:00 2001
From: Frank Brehm <frank.brehm@pixelpark.com>
Date: Thu, 2 Nov 2023 15:00:33 +0100
Subject: [PATCH] Fixing snippets for additional packages.

---
 snippets/tpl.250.pkgs-el7.sh | 24 +++++++++++++++++-------
 snippets/tpl.250.pkgs-el8.sh | 24 +++++++++++++++++-------
 snippets/tpl.250.pkgs-el9.sh |  3 ++-
 3 files changed, 36 insertions(+), 15 deletions(-)

diff --git a/snippets/tpl.250.pkgs-el7.sh b/snippets/tpl.250.pkgs-el7.sh
index dd10052..028776f 100644
--- a/snippets/tpl.250.pkgs-el7.sh
+++ b/snippets/tpl.250.pkgs-el7.sh
@@ -13,15 +13,25 @@ install_pkgs_el7() {
     log "Installing additional packages ..."
     echo
 
-    local -a pkgs_add=('colordiff' 'git' 'p7zip' 'screen')
+    # local -a pkgs_add=('colordiff' 'git' 'p7zip' 'screen')
+    local -a pkgs_add=()
     local -a pkgs_remove=('nfs*' 'rpcbind')
 
-    echo "Installing packages: ${pkgs_add[*]}"
-    yum install -y "${pkgs_add[@]}"
-
-    echo
-    echo "Removing packages: ${pkgs_remove[*]}"
-    yum remove -y "${pkgs_remove[@]}"
+    if [[ "${#pkgs_add[*]}" -gt 0 ]] ; then
+        echo
+        log "Installing additional packages from EPEL ..."
+        echo
+        echo "Installing packages: ${pkgs_add[*]}"
+        yum install -y "${pkgs_add[@]}"
+    fi
+
+    if [[ "${#pkgs_remove[*]}" -gt 0 ]] ; then
+        echo
+        log "Removing pointless packages ..."
+        echo
+        echo "Removing packages: ${pkgs_remove[*]}"
+        yum remove -y "${pkgs_remove[@]}"
+    fi
 
     echo
     echo "Creating /etc/gitconfig ..."
diff --git a/snippets/tpl.250.pkgs-el8.sh b/snippets/tpl.250.pkgs-el8.sh
index 3f46577..e958080 100644
--- a/snippets/tpl.250.pkgs-el8.sh
+++ b/snippets/tpl.250.pkgs-el8.sh
@@ -13,15 +13,25 @@ install_pkgs_centos8() {
     log "Installing additional packages ..."
     echo
 
-    local -a pkgs_add=('colordiff' 'git' 'p7zip' 'screen' 'NetworkManager-config-server')
+    # local -a pkgs_add=('colordiff' 'git' 'p7zip' 'screen' 'NetworkManager-config-server')
+    local -a pkgs_add=()
     local -a pkgs_remove=('nfs*' 'rpcbind')
 
-    echo "Installing packages: ${pkgs_add[*]}"
-    yum install -y "${pkgs_add[@]}"
-
-    echo
-    echo "Removing packages: ${pkgs_remove[*]}"
-    yum remove -y "${pkgs_remove[@]}"
+    if [[ "${#pkgs_add[*]}" -gt 0 ]] ; then
+        echo
+        log "Installing additional packages from EPEL ..."
+        echo
+        echo "Installing packages: ${pkgs_add[*]}"
+        yum install -y "${pkgs_add[@]}"
+    fi
+
+    if [[ "${#pkgs_remove[*]}" -gt 0 ]] ; then
+        echo
+        log "Removing pointless packages ..."
+        echo
+        echo "Removing packages: ${pkgs_remove[*]}"
+        yum remove -y "${pkgs_remove[@]}"
+    fi
 
     echo
     echo "Creating /etc/gitconfig ..."
diff --git a/snippets/tpl.250.pkgs-el9.sh b/snippets/tpl.250.pkgs-el9.sh
index 711b4d7..bc02665 100644
--- a/snippets/tpl.250.pkgs-el9.sh
+++ b/snippets/tpl.250.pkgs-el9.sh
@@ -10,7 +10,8 @@ install_pkgs_el9() {
     echo "Calling install_pkgs_el9() ..."
     echo
 
-    local -a pkgs_add=('p7zip' 'screen')
+    # local -a pkgs_add=('p7zip' 'screen')
+    local -a pkgs_add=()
     local -a pkgs_remove=()
 
     if [[ "${#pkgs_add[*]}" -gt 0 ]] ; then
-- 
2.39.5