From 88f4cdf14fd8617152486a485bbd2ecaca71ac47 Mon Sep 17 00:00:00 2001
From: Mathieu Broillet <mathieu@broillet.ch>
Date: Mon, 12 Jun 2023 22:05:21 +0200
Subject: [PATCH] fixed running bash script remotely and install package error

---
 src/utils/lxc_commands_utils.py | 11 ++++++++---
 src/utils/proxmox_utils.py      |  2 +-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/utils/lxc_commands_utils.py b/src/utils/lxc_commands_utils.py
index 400fa83..47c6adc 100644
--- a/src/utils/lxc_commands_utils.py
+++ b/src/utils/lxc_commands_utils.py
@@ -17,6 +17,11 @@ def run_script(lxc, step):
         Typically read from the "creation/steps/<step>" in JSON file
     """
 
+    # Install bash if not installed
+    # Sometimes only ash or sh are installed, which doesn't work for some scripts
+    if not lxc.has_program("bash"):
+        install_package(lxc, "bash")
+
     # Run local script
     if "path" in step:
         _run_local_script_on_lxc(lxc, step["path"])
@@ -42,7 +47,7 @@ def _run_local_script_on_lxc(lxc, path: "Path to the script on the machine runni
     path = get_path(lxc, path)
     with open(path, "r") as file:
         script = file.read()
-        lxc.run_command("'bash -s' <<'ENDSSH'\n" + script)
+        lxc.run_command("bash <<EOF\n" + script + "\nEOF")
 
 
 def _run_remote_script_on_lxc(lxc, url: "URL to the script"):
@@ -196,9 +201,9 @@ def install_package(lxc, package):
 
     if type(package) is list:
         for p in package:
-            lxc.run_command(f"{proxmox_utils.get_install_package_command(lxc.get_os_name())} {p} -y")
+            lxc.run_command(f"{proxmox_utils.get_install_package_command(lxc.get_os_name())} {p}")
     else:
-        lxc.run_command(f"{proxmox_utils.get_install_package_command(lxc.get_os_name())} {package} -y")
+        lxc.run_command(f"{proxmox_utils.get_install_package_command(lxc.get_os_name())} {package}")
 
 
 def remove_package(lxc, package):
diff --git a/src/utils/proxmox_utils.py b/src/utils/proxmox_utils.py
index cdacb34..0c64076 100644
--- a/src/utils/proxmox_utils.py
+++ b/src/utils/proxmox_utils.py
@@ -142,7 +142,7 @@ def get_install_package_command(distribution):
     elif distribution == "gentoo":
         return "emerge -a"
     elif distribution == "alpine":
-        return "apk add --no-cache"
+        return "apk add"
     elif distribution == "archlinux":
         return "pacman -S --noconfirm"
     elif distribution == "devuan":