Fix Podman Install (#8)

WIPACrepo · Jan 14, 2025 · 5b9368a · 5b9368a
1 parent 5a0bae7
commit 5b9368a
Showing 1 changed file with 11 additions and 19 deletions.
diff --git a/utils/install-podman.sh b/utils/install-podman.sh
@@ -1,6 +1,7 @@
 #!/bin/bash
+set -euo pipefail
 sleep 0.1 && echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
-echo "$( basename "$0" )..." && echo
+echo "$(basename "$0")..." && echo
 set -ex
 
 ########################################################################
@@ -12,33 +13,24 @@ set -ex
 
 sudo mkdir -p /etc/apt/keyrings
 
-# # Debian Testing/Bookworm
-# curl -fsSL https://download.opensuse.org/repositories/devel:kubic:libcontainers:unstable/Debian_Testing/Release.key \
-#   | gpg --dearmor \
-#   | sudo tee /etc/apt/keyrings/devel_kubic_libcontainers_unstable.gpg > /dev/null
-# echo \
-#   "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/devel_kubic_libcontainers_unstable.gpg]\
-#     https://download.opensuse.org/repositories/devel:kubic:libcontainers:unstable/Debian_Testing/ /" \
-#   | sudo tee /etc/apt/sources.list.d/devel:kubic:libcontainers:unstable.list > /dev/null
-
-# OS=Debian_Unstable
 OS="xUbuntu_22.04"
+STABLE="stable"
+
+curl -fsSL https://download.opensuse.org/repositories/devel:kubic:libcontainers:$STABLE/$OS/Release.key |
+    gpg --dearmor |
+    sudo tee /etc/apt/keyrings/devel_kubic_libcontainers_$STABLE.gpg >/dev/null
 
-# Debian Unstable/Sid
-curl -fsSL https://download.opensuse.org/repositories/devel:kubic:libcontainers:unstable/$OS/Release.key \
-  | gpg --dearmor \
-  | sudo tee /etc/apt/keyrings/devel_kubic_libcontainers_unstable.gpg > /dev/null
 # -> see https://github.com/openSUSE/MirrorCache/issues/428#issuecomment-1814992424
 echo \
-  "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/devel_kubic_libcontainers_unstable.gpg]\
-    https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/unstable/$OS/ /" \
-  | sudo tee /etc/apt/sources.list.d/devel:kubic:libcontainers:unstable.list > /dev/null
+    "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/devel_kubic_libcontainers_$STABLE.gpg]\
+    https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/$STABLE/$OS/ /" |
+    sudo tee /etc/apt/sources.list.d/devel:kubic:libcontainers:$STABLE.list >/dev/null
 
 # install deps
 sudo apt-get update
 sudo apt-get -y upgrade
 # https://github.com/containers/podman/issues/21024#issuecomment-1859449360
-wget https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/xUbuntu_22.04/amd64/conmon_2.1.2~0_amd64.deb -O /tmp/conmon_2.1.2.deb
+wget https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/$STABLE/$OS/amd64/conmon_2.1.2~0_amd64.deb -O /tmp/conmon_2.1.2.deb
 sudo apt install /tmp/conmon_2.1.2.deb
 
 # Install Podman