feat(desktop): Add reset-bazzite-arch just command to completely remo…

…ve the image and pull it fresh.
ublue-os · Sep 22, 2023 · 3541b1d · 3541b1d
1 parent 3c5f2ca
commit 3541b1d
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 10 deletions.
diff --git a/system_files/deck/shared/usr/share/ublue-os/just/30-distrobox.just b/system_files/deck/shared/usr/share/ublue-os/just/30-distrobox.just
@@ -49,7 +49,7 @@ distrobox-bazzite-arch:
 # Install Webapp manager
 install-webapp-manager:
   if grep -qz "fedora" <<< $(distrobox list); then \
-    /usr/bin/just distrobox-fedora \
+    /usr/bin/just --unstable distrobox-fedora \
   fi && \
   distrobox-enter -n fedora -- sudo sh -c "sudo dnf copr enable -y kylegospo/webapp-manager && \
     sudo dnf install -y webapp-manager && \
@@ -58,7 +58,7 @@ install-webapp-manager:
 # Install Oversteer for Logitech steering wheels
 install-oversteer:
   if grep -qz "fedora" <<< $(distrobox list); then \
-    /usr/bin/just distrobox-fedora \
+    /usr/bin/just --unstable distrobox-fedora \
   fi && \
   distrobox enter -n fedora -- bash -c 'sudo dnf copr enable -y kylegospo/oversteer && \
     sudo dnf install \
@@ -69,7 +69,7 @@ install-oversteer:
 # Install OpenRazer for Razer gaming hardware
 install-openrazer:
   if grep -qz "fedora" <<< $(distrobox list); then \
-    /usr/bin/just distrobox-fedora \
+    /usr/bin/just --unstable distrobox-fedora \
   fi && \
   distrobox-enter -n fedora -- bash -c 'sudo wget https://download.opensuse.org/repositories/hardware:/razer/Fedora_$(rpm -E %fedora)/hardware:razer.repo -O /etc/yum.repos.d/hardware:razer.repo && \
     sudo dnf install -y \
@@ -78,7 +78,7 @@ install-openrazer:
 # Install Solaar for Logitech Mice, Keyboards, and Trackpads
 install-solaar:
   if grep -qz "fedora" <<< $(distrobox list); then \
-    /usr/bin/just distrobox-fedora \
+    /usr/bin/just --unstable distrobox-fedora \
   fi && \
   distrobox-enter -n fedora -- bash -c 'sudo dnf install -y \
     solaar && \
@@ -90,7 +90,7 @@ install-solaar:
 # Install Resilio Sync, a file synchronization utility powered by BitTorrent
 install-resilio-sync:
   if grep -qz "fedora" <<< $(distrobox list); then \
-    /usr/bin/just distrobox-fedora \
+    /usr/bin/just --unstable distrobox-fedora \
   fi && \
   distrobox-enter -n fedora -- bash -c 'sudo rpm --import https://linux-packages.resilio.com/resilio-sync/key.asc && \
     printf "[resilio-sync]\nname=Resilio Sync\nbaseurl=https://linux-packages.resilio.com/resilio-sync/rpm/\$basearch\nenabled=1\ngpgcheck=1\n" | sudo tee /etc/yum.repos.d/resilio-sync.repo && \

diff --git a/system_files/desktop/shared/usr/share/ublue-os/just/30-distrobox.just b/system_files/desktop/shared/usr/share/ublue-os/just/30-distrobox.just
@@ -69,10 +69,21 @@ install-bazzite-arch:
   sleep 10 && \
   rm -f ~/Desktop/steam.desktop
 
+# Remove container image for bazzite-arch and reinstall it
+reset-bazzite-arch:
+  distrobox stop bazzite-arch && \
+  distrobox rm bazzite-arch --force \
+  if [[ ${BASE_IMAGE_NAME} == 'kinoite' ]]; then \
+    podman image rm bazzite-arch --force \
+  else \
+    podman image rm bazzite-arch-gnome --force \
+  fi && \
+  /usr/bin/just --unstable install-bazzite-arch
+
 # Install Webapp manager
 install-webapp-manager:
   if grep -qz "fedora" <<< $(distrobox list); then \
-    /usr/bin/just distrobox-fedora \
+    /usr/bin/just --unstable distrobox-fedora \
   fi && \
   distrobox-enter -n fedora -- sudo sh -c "sudo dnf copr enable -y kylegospo/webapp-manager && \
     sudo dnf install -y webapp-manager && \
@@ -81,7 +92,7 @@ install-webapp-manager:
 # Install Oversteer for Logitech steering wheels
 install-oversteer:
   if grep -qz "fedora" <<< $(distrobox list); then \
-    /usr/bin/just distrobox-fedora \
+    /usr/bin/just --unstable distrobox-fedora \
   fi && \
   distrobox enter -n fedora -- bash -c 'sudo dnf copr enable -y kylegospo/oversteer && \
     sudo dnf install \
@@ -92,7 +103,7 @@ install-oversteer:
 # Install OpenRazer for Razer gaming hardware
 install-openrazer:
   if grep -qz "fedora" <<< $(distrobox list); then \
-    /usr/bin/just distrobox-fedora \
+    /usr/bin/just --unstable distrobox-fedora \
   fi && \
   distrobox-enter -n fedora -- bash -c 'sudo wget https://download.opensuse.org/repositories/hardware:/razer/Fedora_$(rpm -E %fedora)/hardware:razer.repo -O /etc/yum.repos.d/hardware:razer.repo && \
     sudo dnf install -y \
@@ -101,7 +112,7 @@ install-openrazer:
 # Install Solaar for Logitech Mice, Keyboards, and Trackpads
 install-solaar:
   if grep -qz "fedora" <<< $(distrobox list); then \
-    /usr/bin/just distrobox-fedora \
+    /usr/bin/just --unstable distrobox-fedora \
   fi && \
   distrobox-enter -n fedora -- bash -c 'sudo dnf install -y \
     solaar && \
@@ -113,7 +124,7 @@ install-solaar:
 # Install Resilio Sync, a file synchronization utility powered by BitTorrent
 install-resilio-sync:
   if grep -qz "fedora" <<< $(distrobox list); then \
-    /usr/bin/just distrobox-fedora \
+    /usr/bin/just --unstable distrobox-fedora \
   fi && \
   distrobox-enter -n fedora -- bash -c 'sudo rpm --import https://linux-packages.resilio.com/resilio-sync/key.asc && \
     printf "[resilio-sync]\nname=Resilio Sync\nbaseurl=https://linux-packages.resilio.com/resilio-sync/rpm/\$basearch\nenabled=1\ngpgcheck=1\n" | sudo tee /etc/yum.repos.d/resilio-sync.repo && \