From 2cf7a2fc29e2095d3d97dfc0f7f843e3350b7c51 Mon Sep 17 00:00:00 2001
From: Kyle Gospodnetich <me@kylegospodneti.ch>
Date: Sun, 3 Sep 2023 16:37:09 -0700
Subject: [PATCH] fix(desktop): Use distrobox create over distrobox assemble
 due to reported issues, ensure output is visible in Bazzite Portal.

---
 .../usr/share/ublue-os/distrobox/bazzite-arch |  9 ---------
 .../usr/share/ublue-os/just/custom.just       | 19 ++++++++++---------
 .../usr/share/ublue-os/distrobox/bazzite-arch |  9 ---------
 3 files changed, 10 insertions(+), 27 deletions(-)
 delete mode 100644 system_files/desktop/kinoite/usr/share/ublue-os/distrobox/bazzite-arch
 delete mode 100644 system_files/desktop/silverblue/usr/share/ublue-os/distrobox/bazzite-arch

diff --git a/system_files/desktop/kinoite/usr/share/ublue-os/distrobox/bazzite-arch b/system_files/desktop/kinoite/usr/share/ublue-os/distrobox/bazzite-arch
deleted file mode 100644
index fb706237..00000000
--- a/system_files/desktop/kinoite/usr/share/ublue-os/distrobox/bazzite-arch
+++ /dev/null
@@ -1,9 +0,0 @@
-[bazzite-arch]
-image=ghcr.io/ublue-os/bazzite-arch
-init=false
-nvidia=true
-pull=true
-root=false
-replace=true
-start_now=true
-volume="/usr/lib/extest/libextest.so:/usr/lib/extest/libextest.so /usr/share/icons:/usr/share/icons /usr/share/themes:/usr/share/themes"
diff --git a/system_files/desktop/shared/usr/share/ublue-os/just/custom.just b/system_files/desktop/shared/usr/share/ublue-os/just/custom.just
index 7476f28f..ebc06fb9 100644
--- a/system_files/desktop/shared/usr/share/ublue-os/just/custom.just
+++ b/system_files/desktop/shared/usr/share/ublue-os/just/custom.just
@@ -1,15 +1,15 @@
 install-bazzite-arch:
   source /etc/default/bazzite && \
   echo 'Installing Bazzite Arch...' && \
-  distrobox assemble create --file /usr/share/ublue-os/distrobox/bazzite-arch && \
-  distrobox-enter -n bazzite-arch -- '  sudo locale-gen' && \
+  if [[ ${BASE_IMAGE_NAME} == 'kinoite' ]]; then \
+    distrobox create --name bazzite-arch --image ghcr.io/ublue-os/bazzite-arch --nvidia --pull --volume /usr/lib/extest/libextest.so:/usr/lib/extest/libextest.so:ro --volume /usr/share/icons:/usr/share/icons:ro --volume /usr/share/themes:/usr/share/themes:ro; \
+  else \
+    distrobox create --name bazzite-arch --image ghcr.io/ublue-os/bazzite-arch-gnome --nvidia --pull --volume /usr/lib/extest/libextest.so:/usr/lib/extest/libextest.so:ro --volume /usr/share/icons:/usr/share/icons:ro --volume /usr/share/themes:/usr/share/themes:ro; \
+  fi && \
+  echo 'Exporting applications...' && \
+  distrobox-enter -n bazzite-arch -- 'bash -c "sudo locale-gen && distrobox-export --app steam && distrobox-export --app lutris && distrobox-export --app protontricks && mkdir -p $HOME/.steam && distrobox-export --bin /usr/bin/steamcmd --export-path ~/.steam && mv $HOME/.steam/steamcmd $HOME/.steam/steamcmd.sh"' && \
+  echo 'Starting Steam...' && \
   distrobox-enter -n bazzite-arch -- '  /usr/bin/bazzite-steam-runtime --silent &>/dev/null &' && \
-  distrobox-enter -n bazzite-arch -- '  distrobox-export --app steam' && \
-  distrobox-enter -n bazzite-arch -- '  distrobox-export --app lutris' && \
-  distrobox-enter -n bazzite-arch -- '  distrobox-export --app protontricks' && \
-  mkdir -p $HOME/.steam && \
-  distrobox-enter -n bazzite-arch -- '  distrobox-export --bin /usr/bin/steamcmd --export-path ~/.steam' && \
-  mv $HOME/.steam/steamcmd $HOME/.steam/steamcmd.sh && \
   if [[ ${BASE_IMAGE_NAME} == 'kinoite' ]]; then \
     echo 'Creating desktop shortcuts...' && \
     cp ~/.local/share/applications/bazzite-arch-steam.desktop ~/Desktop/bazzite-arch-steam.desktop && \
@@ -17,8 +17,9 @@ install-bazzite-arch:
     cp ~/.local/share/applications/bazzite-arch-net.lutris.Lutris.desktop ~/Desktop/bazzite-arch-net.lutris.Lutris.desktop && \
     sed -i 's@  (on bazzite-arch)@@g' ~/Desktop/bazzite-arch-net.lutris.Lutris.desktop; \
   fi && \
+  echo 'Finalizing...' && \
   sleep 10 && \
-  [ ! -e ~/Desktop/steam.desktop ] || rm -f ~/Desktop/steam.desktop
+  rm -f ~/Desktop/steam.desktop
 
 configure-waydroid:
   #!/usr/bin/env bash
diff --git a/system_files/desktop/silverblue/usr/share/ublue-os/distrobox/bazzite-arch b/system_files/desktop/silverblue/usr/share/ublue-os/distrobox/bazzite-arch
deleted file mode 100644
index 650af20b..00000000
--- a/system_files/desktop/silverblue/usr/share/ublue-os/distrobox/bazzite-arch
+++ /dev/null
@@ -1,9 +0,0 @@
-[bazzite-arch]
-image=ghcr.io/ublue-os/bazzite-arch-gnome
-init=false
-nvidia=true
-pull=true
-root=false
-replace=true
-start_now=true
-volume="/usr/lib/extest/libextest.so:/usr/lib/extest/libextest.so /usr/share/icons:/usr/share/icons /usr/share/themes:/usr/share/themes"