From 3586b1af675420ccca995bd69e21dcc4736ef538 Mon Sep 17 00:00:00 2001
From: Marc Beninca <git@marc.beninca.link>
Date: Wed, 21 Aug 2024 13:52:38 +0200
Subject: [PATCH 1/5] spcd_pf_

---
 spcd.sh | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/spcd.sh b/spcd.sh
index b954910..f726c96 100644
--- a/spcd.sh
+++ b/spcd.sh
@@ -265,6 +265,23 @@ ${SPCD_PROJECT_ROOT}$(basename "${GITHUB_SERVER_URL}")"
         ;;
     *) ;;
     esac
+    # set package format
+    case "${SPCD_PM}" in
+    "${SPCD_PM_APK}")
+        SPCD_PF="${SPCD_PF_APK}"
+        ;;
+    "${SPCD_PM_APT}")
+        SPCD_PF="${SPCD_PF_DEB}"
+        ;;
+    "${SPCD_PM_PACMAN}")
+        SPCD_PF="${SPCD_PF_PKG}"
+        ;;
+    "${SPCD_PM_DNF}" | "${SPCD_PM_ZYPPER}")
+        SPCD_PF="${SPCD_PF_RPM}"
+        ;;
+    *) ;;
+    esac
+    # set package manager variables
     spcd_split
     spcd_echo "SPCD_PM"
     case "${SPCD_PM}" in
@@ -998,6 +1015,11 @@ SPCD_OS_OPENSUSE="opensuse"
 SPCD_OS_ROCKY="rocky"
 SPCD_OS_UBUNTU="ubuntu"
 
+SPCD_PF_APK="apk"
+SPCD_PF_DEB="deb"
+SPCD_PF_PKG="pkg"
+SPCD_PF_RPM="rpm"
+
 SPCD_PM_APK="apk"
 SPCD_PM_APT="apt"
 SPCD_PM_DNF="dnf"

From 1093ec0c86e84574859aa4910a3ac8ed8d127c09 Mon Sep 17 00:00:00 2001
From: Marc Beninca <git@marc.beninca.link>
Date: Wed, 21 Aug 2024 13:54:47 +0200
Subject: [PATCH 2/5] spcd_pf

---
 spcd.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spcd.sh b/spcd.sh
index f726c96..d19de50 100644
--- a/spcd.sh
+++ b/spcd.sh
@@ -283,7 +283,7 @@ ${SPCD_PROJECT_ROOT}$(basename "${GITHUB_SERVER_URL}")"
     esac
     # set package manager variables
     spcd_split
-    spcd_echo "SPCD_PM"
+    spcd_echo "SPCD_PF" "SPCD_PM"
     case "${SPCD_PM}" in
     "${SPCD_PM_DNF}")
         SPCD_PM_CLEAN="dnf clean all"

From 83f4d7d3b71769eabab56b350c2dc1856c048558 Mon Sep 17 00:00:00 2001
From: Marc Beninca <git@marc.beninca.link>
Date: Wed, 21 Aug 2024 13:55:17 +0200
Subject: [PATCH 3/5] shfmt

---
 spcd.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/spcd.sh b/spcd.sh
index d19de50..50f7999 100644
--- a/spcd.sh
+++ b/spcd.sh
@@ -977,11 +977,11 @@ spcd_step() {
 spcd_substep() {
     SPCD_SUBSTEP=$((SPCD_SUBSTEP + 1))
     spcd_banner \
-    "${SPCD_STEP}.${SPCD_SUBSTEP}" \
-    "${SPCD_VERT}" \
-    "${SPCD_STEP_TEXT}" \
-    "${SPCD_VERT}" \
-    "${*}"
+        "${SPCD_STEP}.${SPCD_SUBSTEP}" \
+        "${SPCD_VERT}" \
+        "${SPCD_STEP_TEXT}" \
+        "${SPCD_VERT}" \
+        "${*}"
 }
 
 spcd_write() {

From a01423f60449d4750639101106257075b271b205 Mon Sep 17 00:00:00 2001
From: Marc Beninca <git@marc.beninca.link>
Date: Wed, 21 Aug 2024 13:56:58 +0200
Subject: [PATCH 4/5] pf/rpm

---
 spcd.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spcd.sh b/spcd.sh
index 50f7999..c6870ad 100644
--- a/spcd.sh
+++ b/spcd.sh
@@ -798,7 +798,7 @@ spcd_install_packages() {
     # shell check
     spcd_substep "Install ShellCheck"
     case "${SPCD_PM}" in
-    "${SPCD_PM_DNF}" | "${SPCD_PM_ZYPPER}")
+    "${SPCD_PF_RPM}")
         spcd_install_package "ShellCheck"
         ;;
     *) spcd_install_package "shellcheck" ;;

From bcc64b6af3d5c0f4ac2e968373866cbcff74f1ce Mon Sep 17 00:00:00 2001
From: Marc Beninca <git@marc.beninca.link>
Date: Wed, 21 Aug 2024 14:47:29 +0200
Subject: [PATCH 5/5] fixes

---
 spcd.sh | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/spcd.sh b/spcd.sh
index c6870ad..d2fe8f7 100644
--- a/spcd.sh
+++ b/spcd.sh
@@ -797,7 +797,7 @@ spcd_install_packages() {
     spcd_install_package "rsync"
     # shell check
     spcd_substep "Install ShellCheck"
-    case "${SPCD_PM}" in
+    case "${SPCD_PF}" in
     "${SPCD_PF_RPM}")
         spcd_install_package "ShellCheck"
         ;;
@@ -808,7 +808,10 @@ spcd_install_packages() {
     case "${SPCD_OS_ID}" in
     "${SPCD_OS_ALMA}" | "${SPCD_OS_ROCKY}") ;;
     "${SPCD_OS_DEBIAN}")
-        [ "${SPCD_OS_VERSION}" != "bullseye" ] && spcd_install_package "shfmt"
+        case "${SPCD_OS_VERSION}" in
+        "bullseye") ;;
+        *) spcd_install_package "shfmt" ;;
+        esac
         ;;
     *) spcd_install_package "shfmt" ;;
     esac