From 4ab6c4d19c55b8fd6fe0cdbd4c0eacbba2449005 Mon Sep 17 00:00:00 2001
From: Antonio de la Rosa <antonio.delarosa@salirdelhoyo.com>
Date: Wed, 2 Apr 2025 14:49:48 +0200
Subject: [PATCH] Fixes in sh

---
 install_incus_ollama.sh | 63 ++++++++++++++++++++---------------------
 1 file changed, 31 insertions(+), 32 deletions(-)

diff --git a/install_incus_ollama.sh b/install_incus_ollama.sh
index 0ca4b95..7a9cfcf 100644
--- a/install_incus_ollama.sh
+++ b/install_incus_ollama.sh
@@ -12,9 +12,8 @@ run_command() {
     local cmd="$1"
     local description="$2"
     
-    echo -e "${YELLOW}Ejecutando: ${description}...${NC}"
-    echo -e "Comando: ${cmd}\n" >> "${LOG_FILE}"
-    echo "${cmd}"
+    echo "${YELLOW}Ejecutando: ${description}...${NC}"
+    echo "Comando: ${cmd}\n" >> "${LOG_FILE}"
     eval "${cmd} < /dev/null" >> "${LOG_FILE}" 2>&1
     
     if [ $? -ne 0 ]; then
@@ -122,55 +121,55 @@ run_command "incus exec ollama-container  --  mkdir -p /etc/apt/keyrings/" "Aña
 
 run_command "incus exec ollama-container  --  curl -fsSL https://pkgs.zabbly.com/key.asc -o /etc/apt/keyrings/zabbly.asc" "Añadir gpg zabbly en /et/apt/keyrings"
 
-incus exec ollama-container  -- sh -c 'cat <<EOF > /etc/apt/sources.list.d/zabbly-incus-stable.sources
-Enabled: yes
-Types: deb
-URIs: https://pkgs.zabbly.com/incus/stable
-Suites: $(. /etc/os-release && echo ${VERSION_CODENAME})
-Components: main
-Architectures: $(dpkg --print-architecture)
-Signed-By: /etc/apt/keyrings/zabbly.asc
+run_command "incus exec ollama-container  -- sh -c 'cat <<EOF > /etc/apt/sources.list.d/zabbly-incus-stable.sources \
+Enabled: yes \
+Types: deb \
+URIs: https://pkgs.zabbly.com/incus/stable \
+Suites: $(. /etc/os-release && echo ${VERSION_CODENAME}) \
+Components: main \
+Architectures: $(dpkg --print-architecture) \
+Signed-By: /etc/apt/keyrings/zabbly.asc \
+\
+EOF'" "Add incus stable repo"
 
-EOF'
+run_command "incus exec ollama-container  -- apt install -y software-properties-common" "Add software properties package"
 
-incus exec ollama-container  -- apt install -y software-properties-common
+run_command "incus exec ollama-container  -- apt-add-repository -y contrib" "Add contrib"
 
-incus exec ollama-container  -- apt-add-repository -y contrib
+run_command "incus exec ollama-container  -- apt-add-repository -y non-free" "Add non-free"
 
-incus exec ollama-container  -- apt-add-repository -y non-free
+run_command "incus exec ollama-container  -- apt-add-repository -y non-free-firmware" "Add non-free-firmware"
 
-incus exec ollama-container  -- apt-add-repository -y non-free-firmware
-
-incus exec ollama-container  -- apt-get update && sudo apt-get upgrade
+run_command "incus exec ollama-container  -- apt-get update && sudo apt-get upgrade" "Upgrade repos..."
 
 # Install new kernel.
 
-incus exec ollama-container  -- apt-get -y install linux-image-6.11.10+bpo-amd64 linux-headers-6.11.10+bpo-amd64
+run_command "incus exec ollama-container  -- apt-get -y install linux-image-6.11.10+bpo-amd64 linux-headers-6.11.10+bpo-amd64" "Add ollama container"
 
 # Install cuda nvidia drivers
 
 echo "Install nvidia drivers in container"
 
-incus exec ollama-container  -- apt -y purge "*nvidia*"
+run_command "incus exec ollama-container  -- apt -y purge \"*nvidia*\"" "Delete nvidia"
 
-incus exec ollama-container  -- wget https://developer.download.nvidia.com/compute/cuda/repos/debian12/x86_64/cuda-keyring_1.1-1_all.deb
-incus exec ollama-container  -- dpkg -i cuda-keyring_1.1-1_all.deb
-incus exec ollama-container  -- apt-get -y -f install
-incus exec ollama-container  -- apt update
+run_command "incus exec ollama-container  -- wget https://developer.download.nvidia.com/compute/cuda/repos/debian12/x86_64/cuda-keyring_1.1-1_all.deb" ""
+run_command "incus exec ollama-container  -- dpkg -i cuda-keyring_1.1-1_all.deb" ""
+run_command "incus exec ollama-container  -- apt-get -y -f install" ""
+run_command "incus exec ollama-container  -- apt update" ""
 
-incus exec ollama-container  -- bash -c 'echo "deb [signed-by=/usr/share/keyrings/cuda-archive-keyring.gpg] https://developer.download.nvidia.com/compute/cuda/repos/debian12/x86_64/ /" \
-    | tee /etc/apt/sources.list.d/cuda-debian12-x86_64.list'
+run_command "incus exec ollama-container  -- bash -c 'echo "deb [signed-by=/usr/share/keyrings/cuda-archive-keyring.gpg] https://developer.download.nvidia.com/compute/cuda/repos/debian12/x86_64/ /" \
+    | tee /etc/apt/sources.list.d/cuda-debian12-x86_64.list'" ""
     
-incus exec ollama-container  -- apt -y update
+run_command "incus exec ollama-container  -- apt -y update" ""
 
-incus exec ollama-container  -- apt -y install cuda-drivers
+run_command "incus exec ollama-container  -- apt -y install cuda-drivers" ""
 
-echo "Install Ollama in container ollama-container"
+echo "Install Ollama in container ollama-container" ""
 
-incus exec ollama-container  -- apt -y install curl
-incus exec ollama-container  -- curl -fsSL https://ollama.com/install.sh | sh
+run_command "incus exec ollama-container  -- apt -y install curl" ""
+run_command "incus exec ollama-container  -- curl -fsSL https://ollama.com/install.sh | sh" ""
 
-incus exec ollama-container  -- ollama run gemma3:4b
+run_command "incus exec ollama-container  -- ollama run gemma3:4b" ""
 
 echo "Done!!!"