From 6ba3667375546028842e63f8db0101b671217ee1 Mon Sep 17 00:00:00 2001
From: Albert-LGTM <albertdepalo@gmail.com>
Date: Wed, 9 Oct 2024 13:25:25 +0200
Subject: [PATCH 01/15] Added support for installing podman

---
 core/tabs/applications-setup/podman-setup.sh | 83 ++++++++++++++++++++
 core/tabs/applications-setup/tab_data.toml   |  6 ++
 2 files changed, 89 insertions(+)
 create mode 100644 core/tabs/applications-setup/podman-setup.sh

diff --git a/core/tabs/applications-setup/podman-setup.sh b/core/tabs/applications-setup/podman-setup.sh
new file mode 100644
index 00000000..77ec3aef
--- /dev/null
+++ b/core/tabs/applications-setup/podman-setup.sh
@@ -0,0 +1,83 @@
+#!/bin/sh -e
+
+. ../common-script.sh
+
+# Function to prompt the user for installation choice
+choose_installation() { 
+    clear
+    printf "%b\n" "${YELLOW}Choose what to install:${RC}"
+    printf "%b\n" "1. ${YELLOW}Podman${RC}"
+    printf "%b\n" "2. ${YELLOW}Podman Compose${RC}"
+    printf "%b\n" "3. ${YELLOW}Both${RC}"
+    printf "%b" "Enter your choice [1-3]: "
+    read -r CHOICE
+
+    case "$CHOICE" in
+        1) INSTALL_PODMAN=1; INSTALL_COMPOSE=0 ;;
+        2) INSTALL_PODMAN=0; INSTALL_COMPOSE=1 ;;
+        3) INSTALL_PODMAN=1; INSTALL_COMPOSE=1 ;;
+        *) printf "%b\n" "${RED}Invalid choice. Exiting.${RC}"; exit 1 ;;
+    esac
+}
+
+install_podman() {
+    printf "%b\n" "${YELLOW}Installing Podman...${RC}"
+    case "$PACKAGER" in
+        apt-get|nala)
+            "$ESCALATION_TOOL" "$PACKAGER" install -y podman
+            ;;
+        zypper)
+            "$ESCALATION_TOOL" "$PACKAGER" --non-interactive install podman
+            ;;
+        pacman)
+            "$ESCALATION_TOOL" "$PACKAGER" -S --noconfirm podman
+            ;;
+        dnf)
+            "$ESCALATION_TOOL" "$PACKAGER" install -y podman
+            ;;
+        *)
+            printf "%b\n" "${RED}Unsupported package manager: ""$PACKAGER""${RC}"
+            exit 1
+            ;;
+    esac
+}
+
+install_podman_compose() {
+    printf "%b\n" "${YELLOW}Installing Podman Compose...${RC}"
+    case "$PACKAGER" in
+        apt-get|nala|zypper|pacman)
+            "$ESCALATION_TOOL" pip3 install podman-compose
+            ;;
+        dnf)
+            "$ESCALATION_TOOL" "$PACKAGER" install -y podman-compose
+            ;;
+        *)
+            printf "%b\n" "${RED}Unsupported package manager: ""$PACKAGER""${RC}"
+            exit 1
+            ;;
+    esac
+}
+
+install_components() {
+    choose_installation 
+
+    if [ "$INSTALL_PODMAN" -eq 1 ]; then
+        if ! command_exists podman; then
+            install_podman
+        else
+            printf "%b\n" "${GREEN}Podman is already installed.${RC}"
+        fi
+    fi
+
+    if [ "$INSTALL_COMPOSE" -eq 1 ]; then
+        if ! command_exists podman-compose; then
+            install_podman_compose
+        else
+            printf "%b\n" "${GREEN}Podman Compose is already installed.${RC}"
+        fi
+    fi
+}
+
+checkEnv
+checkEscalationTool
+install_components
diff --git a/core/tabs/applications-setup/tab_data.toml b/core/tabs/applications-setup/tab_data.toml
index ef6af7de..2a70285d 100644
--- a/core/tabs/applications-setup/tab_data.toml
+++ b/core/tabs/applications-setup/tab_data.toml
@@ -222,6 +222,12 @@ description = "Docker is an open platform that uses OS-level virtualization to d
 script = "docker-setup.sh"
 task_list = "I SS"
 
+[[data]]
+name = "Podman"
+description = "Podman is a daemon-less open platform that uses OS-level virtualization to deliver software in packages called containers."
+script = "podman-setup.sh"
+task_list = "I SS"
+
 [[data]]
 name = "Fastfetch"
 description = "Fastfetch is a neofetch-like tool for fetching system information and displaying it prettily.\nIt is written mainly in C, with performance and customizability in mind.\nThis command installs fastfetch and configures from CTT's mybash repository.\nhttps://github.com/ChrisTitusTech/mybash"

From e19d8efae10df98a187f2b5dc915081054e4a159 Mon Sep 17 00:00:00 2001
From: Albert-LGTM <albertdepalo@gmail.com>
Date: Wed, 9 Oct 2024 13:38:31 +0200
Subject: [PATCH 02/15] removed llm comment

---
 core/tabs/applications-setup/podman-setup.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/core/tabs/applications-setup/podman-setup.sh b/core/tabs/applications-setup/podman-setup.sh
index 77ec3aef..c6b195a1 100644
--- a/core/tabs/applications-setup/podman-setup.sh
+++ b/core/tabs/applications-setup/podman-setup.sh
@@ -2,7 +2,6 @@
 
 . ../common-script.sh
 
-# Function to prompt the user for installation choice
 choose_installation() { 
     clear
     printf "%b\n" "${YELLOW}Choose what to install:${RC}"

From 9dacd4ba0a4f12cfa119e17054fa162fe70ca723 Mon Sep 17 00:00:00 2001
From: Albert-LGTM <albertdepalo@gmail.com>
Date: Wed, 9 Oct 2024 14:02:40 +0200
Subject: [PATCH 03/15] Added podman to userguide

---
 docs/userguide.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/userguide.md b/docs/userguide.md
index 2b7ad82b..952d01ba 100644
--- a/docs/userguide.md
+++ b/docs/userguide.md
@@ -59,6 +59,7 @@ This command installs and configures DWM and a desktop manager.
 The list of patches applied can be found in CTT's DWM repository
 https://github.com/ChrisTitusTech/dwm-titus
 - **Docker**: Docker is an open platform that uses OS-level virtualization to deliver software in packages called containers.
+- **Podman**: Podman is a daemon-less open platform that uses OS-level virtualization to deliver software in packages called containers.
 - **Fastfetch**: Fastfetch is a neofetch-like tool for fetching system information and displaying it prettily.
 It is written mainly in C, with performance and customizability in mind.
 This command installs fastfetch and configures from CTT's mybash repository.

From 6119920b1c4b30460cbe6f5ec41a03ad6a3c639b Mon Sep 17 00:00:00 2001
From: Albert-LGTM <albertdepalo@gmail.com>
Date: Wed, 9 Oct 2024 14:04:18 +0200
Subject: [PATCH 04/15] Added support for install pythona and pip in case of
 missing. changed pip install to rootless install

---
 core/tabs/applications-setup/podman-setup.sh | 50 +++++++++++++++++++-
 1 file changed, 49 insertions(+), 1 deletion(-)

diff --git a/core/tabs/applications-setup/podman-setup.sh b/core/tabs/applications-setup/podman-setup.sh
index c6b195a1..67277ae1 100644
--- a/core/tabs/applications-setup/podman-setup.sh
+++ b/core/tabs/applications-setup/podman-setup.sh
@@ -41,11 +41,58 @@ install_podman() {
     esac
 }
 
+check_python_pip() {
+    if ! command_exists python3; then
+        printf "%b\n" "${YELLOW}Pip not found. Installing pip...${RC}"
+        case "$PACKAGER" in
+            apt-get|nala)
+                "$ESCALATION_TOOL" "$PACKAGER" install -y python3
+                ;;
+            dnf)
+                "$ESCALATION_TOOL" "$PACKAGER" install -y python3
+                ;;
+            zypper)
+                "$ESCALATION_TOOL" "$PACKAGER" --non-interactive install python3
+                ;;
+            pacman)
+                "$ESCALATION_TOOL" "$PACKAGER" -S --noconfirm python
+                ;;
+            *)
+                printf "%b\n" "${RED}Unsupported package manager: ""$PACKAGER""${RC}"
+                exit 1
+                ;;
+        esac
+    fi
+
+    if ! command_exists pip3; then
+        printf "%b\n" "${YELLOW}Pip not found. Installing pip...${RC}"
+        case "$PACKAGER" in
+            apt-get|nala)
+                "$ESCALATION_TOOL" "$PACKAGER" install -y python3-pip
+                ;;
+            dnf)
+                "$ESCALATION_TOOL" "$PACKAGER" install -y python3-pip
+                ;;
+            zypper)
+                "$ESCALATION_TOOL" "$PACKAGER" --non-interactive install python3-pip
+                ;;
+            pacman)
+                "$ESCALATION_TOOL" "$PACKAGER" -S --noconfirm python-pip
+                ;;
+            *)
+                printf "%b\n" "${RED}Unsupported package manager: ""$PACKAGER""${RC}"
+                exit 1
+                ;;
+        esac
+    fi
+}
+
 install_podman_compose() {
     printf "%b\n" "${YELLOW}Installing Podman Compose...${RC}"
     case "$PACKAGER" in
         apt-get|nala|zypper|pacman)
-            "$ESCALATION_TOOL" pip3 install podman-compose
+            pip3 install --user podman-compose
+            export PATH="$HOME/.local/bin:$PATH"
             ;;
         dnf)
             "$ESCALATION_TOOL" "$PACKAGER" install -y podman-compose
@@ -69,6 +116,7 @@ install_components() {
     fi
 
     if [ "$INSTALL_COMPOSE" -eq 1 ]; then
+        check_python_pip
         if ! command_exists podman-compose; then
             install_podman_compose
         else

From 95aed8127fe245e68e66a3b0c947105286b13d60 Mon Sep 17 00:00:00 2001
From: Albert-LGTM <albertdepalo@gmail.com>
Date: Thu, 10 Oct 2024 14:37:29 +0200
Subject: [PATCH 05/15] changed installing podman-compose with pip to
 packagemanager

---
 core/tabs/applications-setup/podman-setup.sh | 60 +++-----------------
 1 file changed, 9 insertions(+), 51 deletions(-)

diff --git a/core/tabs/applications-setup/podman-setup.sh b/core/tabs/applications-setup/podman-setup.sh
index 67277ae1..5a3779c6 100644
--- a/core/tabs/applications-setup/podman-setup.sh
+++ b/core/tabs/applications-setup/podman-setup.sh
@@ -41,58 +41,17 @@ install_podman() {
     esac
 }
 
-check_python_pip() {
-    if ! command_exists python3; then
-        printf "%b\n" "${YELLOW}Pip not found. Installing pip...${RC}"
-        case "$PACKAGER" in
-            apt-get|nala)
-                "$ESCALATION_TOOL" "$PACKAGER" install -y python3
-                ;;
-            dnf)
-                "$ESCALATION_TOOL" "$PACKAGER" install -y python3
-                ;;
-            zypper)
-                "$ESCALATION_TOOL" "$PACKAGER" --non-interactive install python3
-                ;;
-            pacman)
-                "$ESCALATION_TOOL" "$PACKAGER" -S --noconfirm python
-                ;;
-            *)
-                printf "%b\n" "${RED}Unsupported package manager: ""$PACKAGER""${RC}"
-                exit 1
-                ;;
-        esac
-    fi
-
-    if ! command_exists pip3; then
-        printf "%b\n" "${YELLOW}Pip not found. Installing pip...${RC}"
-        case "$PACKAGER" in
-            apt-get|nala)
-                "$ESCALATION_TOOL" "$PACKAGER" install -y python3-pip
-                ;;
-            dnf)
-                "$ESCALATION_TOOL" "$PACKAGER" install -y python3-pip
-                ;;
-            zypper)
-                "$ESCALATION_TOOL" "$PACKAGER" --non-interactive install python3-pip
-                ;;
-            pacman)
-                "$ESCALATION_TOOL" "$PACKAGER" -S --noconfirm python-pip
-                ;;
-            *)
-                printf "%b\n" "${RED}Unsupported package manager: ""$PACKAGER""${RC}"
-                exit 1
-                ;;
-        esac
-    fi
-}
-
 install_podman_compose() {
     printf "%b\n" "${YELLOW}Installing Podman Compose...${RC}"
     case "$PACKAGER" in
-        apt-get|nala|zypper|pacman)
-            pip3 install --user podman-compose
-            export PATH="$HOME/.local/bin:$PATH"
+        apt-get|nala)
+            "$ESCALATION_TOOL" "$PACKAGER" install -y podman-compose
+            ;;
+        zypper)
+            "$ESCALATION_TOOL" "$PACKAGER" --non-interactive install podman-compose
+            ;;
+        pacman)
+            "$ESCALATION_TOOL" "$PACKAGER" -S --noconfirm podman-compose
             ;;
         dnf)
             "$ESCALATION_TOOL" "$PACKAGER" install -y podman-compose
@@ -116,8 +75,7 @@ install_components() {
     fi
 
     if [ "$INSTALL_COMPOSE" -eq 1 ]; then
-        check_python_pip
-        if ! command_exists podman-compose; then
+        if ! command_exists podman-compose || ! command_exists podman compose version; then
             install_podman_compose
         else
             printf "%b\n" "${GREEN}Podman Compose is already installed.${RC}"

From fe8627711e34c0567840835cc6de49ab5ac19e14 Mon Sep 17 00:00:00 2001
From: Albert de Palo Hardvendel
 <71041549+Albert-LGTM@users.noreply.github.com>
Date: Thu, 10 Oct 2024 14:55:03 +0200
Subject: [PATCH 06/15] Update core/tabs/applications-setup/podman-setup.sh

Only install Podman if it is not installed already.

Co-authored-by: nyx <nnyyxxxx@protonmail.com>
---
 core/tabs/applications-setup/podman-setup.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/tabs/applications-setup/podman-setup.sh b/core/tabs/applications-setup/podman-setup.sh
index 5a3779c6..e5470242 100644
--- a/core/tabs/applications-setup/podman-setup.sh
+++ b/core/tabs/applications-setup/podman-setup.sh
@@ -29,7 +29,7 @@ install_podman() {
             "$ESCALATION_TOOL" "$PACKAGER" --non-interactive install podman
             ;;
         pacman)
-            "$ESCALATION_TOOL" "$PACKAGER" -S --noconfirm podman
+            "$ESCALATION_TOOL" "$PACKAGER" -S --noconfirm --needed podman
             ;;
         dnf)
             "$ESCALATION_TOOL" "$PACKAGER" install -y podman

From 94eade5ab704d563bcd2e318fdbb2f3ff5e97c9b Mon Sep 17 00:00:00 2001
From: Albert de Palo Hardvendel
 <71041549+Albert-LGTM@users.noreply.github.com>
Date: Thu, 10 Oct 2024 14:55:42 +0200
Subject: [PATCH 07/15] Update core/tabs/applications-setup/podman-setup.sh

Only install podman-compose if it is not installed already.

Co-authored-by: nyx <nnyyxxxx@protonmail.com>
---
 core/tabs/applications-setup/podman-setup.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/tabs/applications-setup/podman-setup.sh b/core/tabs/applications-setup/podman-setup.sh
index e5470242..7b0e2a1f 100644
--- a/core/tabs/applications-setup/podman-setup.sh
+++ b/core/tabs/applications-setup/podman-setup.sh
@@ -51,7 +51,7 @@ install_podman_compose() {
             "$ESCALATION_TOOL" "$PACKAGER" --non-interactive install podman-compose
             ;;
         pacman)
-            "$ESCALATION_TOOL" "$PACKAGER" -S --noconfirm podman-compose
+            "$ESCALATION_TOOL" "$PACKAGER" -S --noconfirm --needed podman-compose
             ;;
         dnf)
             "$ESCALATION_TOOL" "$PACKAGER" install -y podman-compose

From 7cada99f16fa6f4a357f1bb7e9f83e8534564041 Mon Sep 17 00:00:00 2001
From: Albert-LGTM <albertdepalo@gmail.com>
Date: Thu, 10 Oct 2024 15:16:19 +0200
Subject: [PATCH 08/15] added podman-compose install option

---
 core/tabs/applications-setup/tab_data.toml | 6 ++++++
 docs/userguide.md                          | 1 +
 2 files changed, 7 insertions(+)

diff --git a/core/tabs/applications-setup/tab_data.toml b/core/tabs/applications-setup/tab_data.toml
index 2a70285d..dc7161f4 100644
--- a/core/tabs/applications-setup/tab_data.toml
+++ b/core/tabs/applications-setup/tab_data.toml
@@ -228,6 +228,12 @@ description = "Podman is a daemon-less open platform that uses OS-level virtuali
 script = "podman-setup.sh"
 task_list = "I SS"
 
+[[data]]
+name = "Podman-compose"
+description = "Podman Compose is a tool for defining and running multi-container applications using Podman."
+script = "podman-compose-setup.sh"
+task_list = "I SS"
+
 [[data]]
 name = "Fastfetch"
 description = "Fastfetch is a neofetch-like tool for fetching system information and displaying it prettily.\nIt is written mainly in C, with performance and customizability in mind.\nThis command installs fastfetch and configures from CTT's mybash repository.\nhttps://github.com/ChrisTitusTech/mybash"
diff --git a/docs/userguide.md b/docs/userguide.md
index 952d01ba..cde2a75d 100644
--- a/docs/userguide.md
+++ b/docs/userguide.md
@@ -60,6 +60,7 @@ The list of patches applied can be found in CTT's DWM repository
 https://github.com/ChrisTitusTech/dwm-titus
 - **Docker**: Docker is an open platform that uses OS-level virtualization to deliver software in packages called containers.
 - **Podman**: Podman is a daemon-less open platform that uses OS-level virtualization to deliver software in packages called containers.
+- **Podman-compose**: Podman Compose is a tool for defining and running multi-container applications using Podman.
 - **Fastfetch**: Fastfetch is a neofetch-like tool for fetching system information and displaying it prettily.
 It is written mainly in C, with performance and customizability in mind.
 This command installs fastfetch and configures from CTT's mybash repository.

From 422d1fd9a815a383642f175000b7de7382440d22 Mon Sep 17 00:00:00 2001
From: Albert-LGTM <albertdepalo@gmail.com>
Date: Thu, 10 Oct 2024 15:18:23 +0200
Subject: [PATCH 09/15] split podman install into podman and podman-compose

---
 .../podman-compose-setup.sh                   | 37 ++++++++++++
 core/tabs/applications-setup/podman-setup.sh  | 59 ++-----------------
 2 files changed, 41 insertions(+), 55 deletions(-)
 create mode 100644 core/tabs/applications-setup/podman-compose-setup.sh

diff --git a/core/tabs/applications-setup/podman-compose-setup.sh b/core/tabs/applications-setup/podman-compose-setup.sh
new file mode 100644
index 00000000..708513bf
--- /dev/null
+++ b/core/tabs/applications-setup/podman-compose-setup.sh
@@ -0,0 +1,37 @@
+#!/bin/sh -e
+
+. ../common-script.sh
+
+install_podman_compose() {
+    printf "%b\n" "${YELLOW}Installing Podman Compose...${RC}"
+    case "$PACKAGER" in
+        apt-get|nala)
+            "$ESCALATION_TOOL" "$PACKAGER" install -y podman-compose
+            ;;
+        zypper)
+            "$ESCALATION_TOOL" "$PACKAGER" --non-interactive install podman-compose
+            ;;
+        pacman)
+            "$ESCALATION_TOOL" "$PACKAGER" -S --noconfirm --needed podman-compose
+            ;;
+        dnf)
+            "$ESCALATION_TOOL" "$PACKAGER" install -y podman-compose
+            ;;
+        *)
+            printf "%b\n" "${RED}Unsupported package manager: ""$PACKAGER""${RC}"
+            exit 1
+            ;;
+    esac
+}
+
+install_components() {
+    if ! command_exists podman-compose || ! command_exists podman compose version; then
+        install_podman_compose
+    else
+        printf "%b\n" "${GREEN}Podman Compose is already installed.${RC}"
+    fi
+}
+
+checkEnv
+checkEscalationTool
+install_components
diff --git a/core/tabs/applications-setup/podman-setup.sh b/core/tabs/applications-setup/podman-setup.sh
index 7b0e2a1f..6d5474b7 100644
--- a/core/tabs/applications-setup/podman-setup.sh
+++ b/core/tabs/applications-setup/podman-setup.sh
@@ -2,23 +2,6 @@
 
 . ../common-script.sh
 
-choose_installation() { 
-    clear
-    printf "%b\n" "${YELLOW}Choose what to install:${RC}"
-    printf "%b\n" "1. ${YELLOW}Podman${RC}"
-    printf "%b\n" "2. ${YELLOW}Podman Compose${RC}"
-    printf "%b\n" "3. ${YELLOW}Both${RC}"
-    printf "%b" "Enter your choice [1-3]: "
-    read -r CHOICE
-
-    case "$CHOICE" in
-        1) INSTALL_PODMAN=1; INSTALL_COMPOSE=0 ;;
-        2) INSTALL_PODMAN=0; INSTALL_COMPOSE=1 ;;
-        3) INSTALL_PODMAN=1; INSTALL_COMPOSE=1 ;;
-        *) printf "%b\n" "${RED}Invalid choice. Exiting.${RC}"; exit 1 ;;
-    esac
-}
-
 install_podman() {
     printf "%b\n" "${YELLOW}Installing Podman...${RC}"
     case "$PACKAGER" in
@@ -41,45 +24,11 @@ install_podman() {
     esac
 }
 
-install_podman_compose() {
-    printf "%b\n" "${YELLOW}Installing Podman Compose...${RC}"
-    case "$PACKAGER" in
-        apt-get|nala)
-            "$ESCALATION_TOOL" "$PACKAGER" install -y podman-compose
-            ;;
-        zypper)
-            "$ESCALATION_TOOL" "$PACKAGER" --non-interactive install podman-compose
-            ;;
-        pacman)
-            "$ESCALATION_TOOL" "$PACKAGER" -S --noconfirm --needed podman-compose
-            ;;
-        dnf)
-            "$ESCALATION_TOOL" "$PACKAGER" install -y podman-compose
-            ;;
-        *)
-            printf "%b\n" "${RED}Unsupported package manager: ""$PACKAGER""${RC}"
-            exit 1
-            ;;
-    esac
-}
-
 install_components() {
-    choose_installation 
-
-    if [ "$INSTALL_PODMAN" -eq 1 ]; then
-        if ! command_exists podman; then
-            install_podman
-        else
-            printf "%b\n" "${GREEN}Podman is already installed.${RC}"
-        fi
-    fi
-
-    if [ "$INSTALL_COMPOSE" -eq 1 ]; then
-        if ! command_exists podman-compose || ! command_exists podman compose version; then
-            install_podman_compose
-        else
-            printf "%b\n" "${GREEN}Podman Compose is already installed.${RC}"
-        fi
+    if ! command_exists podman; then
+        install_podman
+    else
+        printf "%b\n" "${GREEN}Podman is already installed.${RC}"
     fi
 }
 

From c48ee4ea7e519bcc60a0bd91289ebab83cf8f510 Mon Sep 17 00:00:00 2001
From: Albert de Palo Hardvendel
 <71041549+Albert-LGTM@users.noreply.github.com>
Date: Thu, 10 Oct 2024 15:55:39 +0200
Subject: [PATCH 10/15] Update core/tabs/applications-setup/podman-setup.sh

Co-authored-by: nyx <nnyyxxxx@protonmail.com>
---
 core/tabs/applications-setup/podman-setup.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/tabs/applications-setup/podman-setup.sh b/core/tabs/applications-setup/podman-setup.sh
index 6d5474b7..6cc4ea78 100644
--- a/core/tabs/applications-setup/podman-setup.sh
+++ b/core/tabs/applications-setup/podman-setup.sh
@@ -34,4 +34,4 @@ install_components() {
 
 checkEnv
 checkEscalationTool
-install_components
+installPodman

From 46fd0e87fc3ae5317677133f8a1e14a304b9e44a Mon Sep 17 00:00:00 2001
From: Albert de Palo Hardvendel
 <71041549+Albert-LGTM@users.noreply.github.com>
Date: Thu, 10 Oct 2024 15:55:50 +0200
Subject: [PATCH 11/15] Update core/tabs/applications-setup/podman-setup.sh

Co-authored-by: nyx <nnyyxxxx@protonmail.com>
---
 core/tabs/applications-setup/podman-setup.sh | 44 +++++++++-----------
 1 file changed, 20 insertions(+), 24 deletions(-)

diff --git a/core/tabs/applications-setup/podman-setup.sh b/core/tabs/applications-setup/podman-setup.sh
index 6cc4ea78..485cd09e 100644
--- a/core/tabs/applications-setup/podman-setup.sh
+++ b/core/tabs/applications-setup/podman-setup.sh
@@ -2,31 +2,27 @@
 
 . ../common-script.sh
 
-install_podman() {
-    printf "%b\n" "${YELLOW}Installing Podman...${RC}"
-    case "$PACKAGER" in
-        apt-get|nala)
-            "$ESCALATION_TOOL" "$PACKAGER" install -y podman
-            ;;
-        zypper)
-            "$ESCALATION_TOOL" "$PACKAGER" --non-interactive install podman
-            ;;
-        pacman)
-            "$ESCALATION_TOOL" "$PACKAGER" -S --noconfirm --needed podman
-            ;;
-        dnf)
-            "$ESCALATION_TOOL" "$PACKAGER" install -y podman
-            ;;
-        *)
-            printf "%b\n" "${RED}Unsupported package manager: ""$PACKAGER""${RC}"
-            exit 1
-            ;;
-    esac
-}
-
-install_components() {
+installPodman() {
     if ! command_exists podman; then
-        install_podman
+        printf "%b\n" "${YELLOW}Installing Podman...${RC}"
+        case "$PACKAGER" in
+            apt-get|nala)
+                "$ESCALATION_TOOL" "$PACKAGER" install -y podman
+                ;;
+            zypper)
+                "$ESCALATION_TOOL" "$PACKAGER" --non-interactive install podman
+                ;;
+            pacman)
+                "$ESCALATION_TOOL" "$PACKAGER" -S --noconfirm --needed podman
+                ;;
+            dnf)
+                "$ESCALATION_TOOL" "$PACKAGER" install -y podman
+                ;;
+            *)
+                printf "%b\n" "${RED}Unsupported package manager: ""$PACKAGER""${RC}"
+                exit 1
+                ;;
+        esac
     else
         printf "%b\n" "${GREEN}Podman is already installed.${RC}"
     fi

From be6cd6548712dfae9d8b1a0817b21cef2c889514 Mon Sep 17 00:00:00 2001
From: Albert de Palo Hardvendel
 <71041549+Albert-LGTM@users.noreply.github.com>
Date: Thu, 10 Oct 2024 15:56:02 +0200
Subject: [PATCH 12/15] Update
 core/tabs/applications-setup/podman-compose-setup.sh

Co-authored-by: nyx <nnyyxxxx@protonmail.com>
---
 core/tabs/applications-setup/podman-compose-setup.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/tabs/applications-setup/podman-compose-setup.sh b/core/tabs/applications-setup/podman-compose-setup.sh
index 708513bf..ef5b72cc 100644
--- a/core/tabs/applications-setup/podman-compose-setup.sh
+++ b/core/tabs/applications-setup/podman-compose-setup.sh
@@ -34,4 +34,4 @@ install_components() {
 
 checkEnv
 checkEscalationTool
-install_components
+installPodmanCompose

From 9611dd378651e5cfc3d41bf77ef059de3ac3591f Mon Sep 17 00:00:00 2001
From: Albert de Palo Hardvendel
 <71041549+Albert-LGTM@users.noreply.github.com>
Date: Thu, 10 Oct 2024 15:56:09 +0200
Subject: [PATCH 13/15] Update
 core/tabs/applications-setup/podman-compose-setup.sh

Co-authored-by: nyx <nnyyxxxx@protonmail.com>
---
 .../podman-compose-setup.sh                   | 46 +++++++++----------
 1 file changed, 21 insertions(+), 25 deletions(-)

diff --git a/core/tabs/applications-setup/podman-compose-setup.sh b/core/tabs/applications-setup/podman-compose-setup.sh
index ef5b72cc..51d8913c 100644
--- a/core/tabs/applications-setup/podman-compose-setup.sh
+++ b/core/tabs/applications-setup/podman-compose-setup.sh
@@ -2,31 +2,27 @@
 
 . ../common-script.sh
 
-install_podman_compose() {
-    printf "%b\n" "${YELLOW}Installing Podman Compose...${RC}"
-    case "$PACKAGER" in
-        apt-get|nala)
-            "$ESCALATION_TOOL" "$PACKAGER" install -y podman-compose
-            ;;
-        zypper)
-            "$ESCALATION_TOOL" "$PACKAGER" --non-interactive install podman-compose
-            ;;
-        pacman)
-            "$ESCALATION_TOOL" "$PACKAGER" -S --noconfirm --needed podman-compose
-            ;;
-        dnf)
-            "$ESCALATION_TOOL" "$PACKAGER" install -y podman-compose
-            ;;
-        *)
-            printf "%b\n" "${RED}Unsupported package manager: ""$PACKAGER""${RC}"
-            exit 1
-            ;;
-    esac
-}
-
-install_components() {
-    if ! command_exists podman-compose || ! command_exists podman compose version; then
-        install_podman_compose
+installPodmanCompose() {
+    if ! command_exists podman-compose; then
+        printf "%b\n" "${YELLOW}Installing Podman Compose...${RC}"
+        case "$PACKAGER" in
+            apt-get|nala)
+                "$ESCALATION_TOOL" "$PACKAGER" install -y podman-compose
+                ;;
+            zypper)
+                "$ESCALATION_TOOL" "$PACKAGER" --non-interactive install podman-compose
+                ;;
+            pacman)
+                "$ESCALATION_TOOL" "$PACKAGER" -S --noconfirm --needed podman-compose
+                ;;
+            dnf)
+                "$ESCALATION_TOOL" "$PACKAGER" install -y podman-compose
+                ;;
+            *)
+                printf "%b\n" "${RED}Unsupported package manager: ""$PACKAGER""${RC}"
+                exit 1
+                ;;
+        esac
     else
         printf "%b\n" "${GREEN}Podman Compose is already installed.${RC}"
     fi

From 49df3f6e827b4a2fe6ba50fe890e4ed25edd2f1f Mon Sep 17 00:00:00 2001
From: Albert de Palo Hardvendel
 <71041549+Albert-LGTM@users.noreply.github.com>
Date: Wed, 23 Oct 2024 09:51:45 +0200
Subject: [PATCH 14/15] Update
 core/tabs/applications-setup/podman-compose-setup.sh

Removed redundant quotes

Co-authored-by: JEEVITHA KANNAN K S <ksjeevithakannan123@gmail.com>
---
 core/tabs/applications-setup/podman-compose-setup.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/tabs/applications-setup/podman-compose-setup.sh b/core/tabs/applications-setup/podman-compose-setup.sh
index 51d8913c..02db3ed7 100644
--- a/core/tabs/applications-setup/podman-compose-setup.sh
+++ b/core/tabs/applications-setup/podman-compose-setup.sh
@@ -19,7 +19,7 @@ installPodmanCompose() {
                 "$ESCALATION_TOOL" "$PACKAGER" install -y podman-compose
                 ;;
             *)
-                printf "%b\n" "${RED}Unsupported package manager: ""$PACKAGER""${RC}"
+                printf "%b\n" "${RED}Unsupported package manager: ${PACKAGER}${RC}"
                 exit 1
                 ;;
         esac

From ca66716bd5f521bd99acf7c40816d669d353a467 Mon Sep 17 00:00:00 2001
From: Albert de Palo Hardvendel
 <71041549+Albert-LGTM@users.noreply.github.com>
Date: Wed, 23 Oct 2024 09:51:56 +0200
Subject: [PATCH 15/15] Update core/tabs/applications-setup/podman-setup.sh

Removed redundant quotes

Co-authored-by: JEEVITHA KANNAN K S <ksjeevithakannan123@gmail.com>
---
 core/tabs/applications-setup/podman-setup.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/tabs/applications-setup/podman-setup.sh b/core/tabs/applications-setup/podman-setup.sh
index 485cd09e..07a0b5f6 100644
--- a/core/tabs/applications-setup/podman-setup.sh
+++ b/core/tabs/applications-setup/podman-setup.sh
@@ -19,7 +19,7 @@ installPodman() {
                 "$ESCALATION_TOOL" "$PACKAGER" install -y podman
                 ;;
             *)
-                printf "%b\n" "${RED}Unsupported package manager: ""$PACKAGER""${RC}"
+                printf "%b\n" "${RED}Unsupported package manager: ${PACKAGER}${RC}"
                 exit 1
                 ;;
         esac