chore: Change how SteamCMD is exported to avoid a race condition.

fix(deck): Export extest to bazzite-arch, if used.
This commit is contained in:
Kyle Gospodnetich 2023-08-13 13:59:56 -07:00
parent 4382980019
commit 615ee6fe20
9 changed files with 5 additions and 10 deletions

View File

@ -6,4 +6,5 @@ pull=true
root=false root=false
replace=false replace=false
start_now=true start_now=true
volume=/usr/lib/extest/libextest.so:/usr/lib/extest/libextest.so
init_hooks=pacman -S rocm-opencl-runtime rocm-hip-runtime --noconfirm init_hooks=pacman -S rocm-opencl-runtime rocm-hip-runtime --noconfirm

View File

@ -6,3 +6,4 @@ pull=true
root=false root=false
replace=false replace=false
start_now=true start_now=true
volume=/usr/lib/extest/libextest.so:/usr/lib/extest/libextest.so

View File

@ -6,4 +6,5 @@ pull=true
root=false root=false
replace=false replace=false
start_now=true start_now=true
volume=/usr/lib/extest/libextest.so:/usr/lib/extest/libextest.so
init_hooks=pacman -Rnsdd xdg-desktop-portal-kde --noconfirm && pacman -S xdg-desktop-portal-gnome rocm-opencl-runtime rocm-hip-runtime --noconfirm && runuser -u $USER -- paru -S adw-gtk3 --noconfirm init_hooks=pacman -Rnsdd xdg-desktop-portal-kde --noconfirm && pacman -S xdg-desktop-portal-gnome rocm-opencl-runtime rocm-hip-runtime --noconfirm && runuser -u $USER -- paru -S adw-gtk3 --noconfirm

View File

@ -6,4 +6,5 @@ pull=true
root=false root=false
replace=false replace=false
start_now=true start_now=true
volume=/usr/lib/extest/libextest.so:/usr/lib/extest/libextest.so
init_hooks=pacman -Rnsdd xdg-desktop-portal-kde --noconfirm && pacman -S xdg-desktop-portal-gnome --noconfirm && runuser -u $USER -- paru -S adw-gtk3 --noconfirm init_hooks=pacman -Rnsdd xdg-desktop-portal-kde --noconfirm && pacman -S xdg-desktop-portal-gnome --noconfirm && runuser -u $USER -- paru -S adw-gtk3 --noconfirm

View File

@ -9,5 +9,3 @@ start_now=true
volume=/usr/lib/extest/libextest.so:/usr/lib/extest/libextest.so volume=/usr/lib/extest/libextest.so:/usr/lib/extest/libextest.so
init_hooks=pacman -S rocm-opencl-runtime rocm-hip-runtime --noconfirm && runuser -u $USER -- paru -S steamcmd --noconfirm init_hooks=pacman -S rocm-opencl-runtime rocm-hip-runtime --noconfirm && runuser -u $USER -- paru -S steamcmd --noconfirm
exported_apps="steam lutris protontricks" exported_apps="steam lutris protontricks"
exported_bins="/usr/bin/steamcmd"
exported_bins_path="~/.steam"

View File

@ -9,5 +9,3 @@ start_now=true
volume=/usr/lib/extest/libextest.so:/usr/lib/extest/libextest.so volume=/usr/lib/extest/libextest.so:/usr/lib/extest/libextest.so
init_hooks=runuser -u $USER -- paru -S steamcmd --noconfirm init_hooks=runuser -u $USER -- paru -S steamcmd --noconfirm
exported_apps="steam lutris protontricks" exported_apps="steam lutris protontricks"
exported_bins="/usr/bin/steamcmd"
exported_bins_path="~/.steam"

View File

@ -2,7 +2,6 @@ install-bazzite-arch:
#!/usr/bin/env bash #!/usr/bin/env bash
source /etc/default/bazzite source /etc/default/bazzite
mkdir -p ~/.steam
if [[ ${IMAGE_FLAVOR} == 'nvidia' ]]; then if [[ ${IMAGE_FLAVOR} == 'nvidia' ]]; then
echo 'Installing Bazzite Arch (Nvidia)...' echo 'Installing Bazzite Arch (Nvidia)...'
distrobox assemble create --file /usr/share/ublue-os/distrobox/bazzite-arch-nvidia distrobox assemble create --file /usr/share/ublue-os/distrobox/bazzite-arch-nvidia
@ -13,7 +12,7 @@ install-bazzite-arch:
distrobox-enter -n bazzite-arch -- ' /usr/bin/bazzite-steam-runtime --silent &>/dev/null &' distrobox-enter -n bazzite-arch -- ' /usr/bin/bazzite-steam-runtime --silent &>/dev/null &'
cp ~/.local/share/applications/bazzite-arch-steam.desktop ~/.config/autostart/bazzite-arch-steam-silent.desktop cp ~/.local/share/applications/bazzite-arch-steam.desktop ~/.config/autostart/bazzite-arch-steam-silent.desktop
sed -i 's@/usr/bin/bazzite-steam-runtime %U@/usr/bin/bazzite-steam-runtime -silent %U@g' ~/.config/autostart/bazzite-arch-steam-silent.desktop sed -i 's@/usr/bin/bazzite-steam-runtime %U@/usr/bin/bazzite-steam-runtime -silent %U@g' ~/.config/autostart/bazzite-arch-steam-silent.desktop
mv ~/.steam/steamcmd ~/.steam/steamcmd.sh distrobox-enter -n bazzite-arch -- ' mkdir -p ~/.steam && distrobox-export --bin /usr/bin/steamcmd --export-path ~/.steam && mv ~/.steam/steamcmd ~/.steam/steamcmd.sh'
if [[ ${BASE_IMAGE_NAME} == 'kinoite' ]]; then if [[ ${BASE_IMAGE_NAME} == 'kinoite' ]]; then
echo 'Creating desktop shortcuts...' echo 'Creating desktop shortcuts...'
cp ~/.local/share/applications/bazzite-arch-steam.desktop ~/Desktop/bazzite-arch-steam.desktop cp ~/.local/share/applications/bazzite-arch-steam.desktop ~/Desktop/bazzite-arch-steam.desktop

View File

@ -9,5 +9,3 @@ start_now=true
volume=/usr/lib/extest/libextest.so:/usr/lib/extest/libextest.so volume=/usr/lib/extest/libextest.so:/usr/lib/extest/libextest.so
init_hooks=pacman -Rnsdd xdg-desktop-portal-kde --noconfirm && pacman -S xdg-desktop-portal-gnome rocm-opencl-runtime rocm-hip-runtime --noconfirm && runuser -u $USER -- paru -S steamcmd adw-gtk3 --noconfirm init_hooks=pacman -Rnsdd xdg-desktop-portal-kde --noconfirm && pacman -S xdg-desktop-portal-gnome rocm-opencl-runtime rocm-hip-runtime --noconfirm && runuser -u $USER -- paru -S steamcmd adw-gtk3 --noconfirm
exported_apps="steam lutris protontricks" exported_apps="steam lutris protontricks"
exported_bins="/usr/bin/steamcmd"
exported_bins_path="~/.steam"

View File

@ -9,5 +9,3 @@ start_now=true
volume=/usr/lib/extest/libextest.so:/usr/lib/extest/libextest.so volume=/usr/lib/extest/libextest.so:/usr/lib/extest/libextest.so
init_hooks=pacman -Rnsdd xdg-desktop-portal-kde --noconfirm && pacman -S xdg-desktop-portal-gnome --noconfirm && runuser -u $USER -- paru -S steamcmd adw-gtk3 --noconfirm init_hooks=pacman -Rnsdd xdg-desktop-portal-kde --noconfirm && pacman -S xdg-desktop-portal-gnome --noconfirm && runuser -u $USER -- paru -S steamcmd adw-gtk3 --noconfirm
exported_apps="steam lutris protontricks" exported_apps="steam lutris protontricks"
exported_bins="/usr/bin/steamcmd"
exported_bins_path="~/.steam"