Merge pull request #36 from ublue-os/main

[pull] main from ublue-os:main
andrewk10 · Jan 6, 2025 · 3cff7b6 · 3cff7b6
2 parents 3a69dd3 + 36818b4
commit 3cff7b6
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 40 deletions.
diff --git a/system_files/desktop/shared/usr/bin/bazzite-steam b/system_files/desktop/shared/usr/bin/bazzite-steam
@@ -35,61 +35,31 @@ if [[ $IMAGE_NAME =~ "deck" || $IMAGE_NAME =~ "ally" ]]; then
   if [ ! -f $HOME/.local/share/Steam/config/uioverrides/movies/bazzite_novideo ]; then
 
     LOCATION_STARTUP=$HOME/.local/share/Steam/config/uioverrides/movies/deck_startup.webm
-    LOCATION_STARTUP_DECK=$HOME/.local/share/Steam/steamui/movies/deck_startup.webm
-    LOCATION_STARTUP_OLED=$HOME/.local/share/Steam/steamui/movies/oled_startup.webm
-
+    LOCATION_SUSPEND=$HOME/.local/share/Steam/config/uioverrides/movies/steam_os_suspend.webm
+    LOCATION_SUSPEND_OLD=$HOME/.local/share/Steam/config/uioverrides/movies/deck-suspend-animation.webm
+    LOCATION_THROBBER=$HOME/.local/share/Steam/config/uioverrides/movies/steam_os_suspend_from_throbber.webm
+    LOCATION_THROBBER_OLD=$HOME/.local/share/Steam/config/uioverrides/movies/deck-suspend-animation-from-throbber.webm
+
     if ! cmp --silent $VIDEO_STARTUP $LOCATION_STARTUP; then
       cp $VIDEO_STARTUP $LOCATION_STARTUP
     fi
 
-    if ! cmp --silent $DECK_STARTUP $LOCATION_STARTUP_DECK; then
-      cp $DECK_STARTUP $LOCATION_STARTUP_DECK
-    fi
-
-    if ! cmp --silent $OLED_STARTUP $LOCATION_STARTUP_OLED; then
-      cp $OLED_STARTUP $LOCATION_STARTUP_OLED
+    if ! cmp --silent $VIDEO_SUSPEND $LOCATION_SUSPEND; then
+      cp $VIDEO_SUSPEND $LOCATION_SUSPEND
     fi
 
-    LOCATION_SUSPEND_OLD=$HOME/.local/share/Steam/config/uioverrides/movies/deck-suspend-animation.webm
-    LOCATION_THROBBER_OLD=$HOME/.local/share/Steam/config/uioverrides/movies/deck-suspend-animation-from-throbber.webm
-    LOCATION_SUSPEND=$HOME/.local/share/Steam/config/uioverrides/movies/steam_os_suspend.webm
-    LOCATION_THROBBER=$HOME/.local/share/Steam/config/uioverrides/movies/deck-suspend-animation-from-throbber.webm
-    LOCATION_SUSPEND_DECK=$HOME/.local/share/Steam/steamui/movies/deck-suspend-animation-from-throbber.webm
-    LOCATION_THROBBER_DECK=$HOME/.local/share/Steam/steamui/movies/deck-suspend-animation.webm
-    LOCATION_SUSPEND_OLED=$HOME/.local/share/Steam/steamui/movies/oled-suspend-animation-from-throbber.webm
-    LOCATION_THROBBER_OLED=$HOME/.local/share/Steam/steamui/movies/oled-suspend-animation.webm
-
     if ! cmp --silent $VIDEO_SUSPEND $LOCATION_SUSPEND_OLD; then
       cp $VIDEO_SUSPEND $LOCATION_SUSPEND_OLD
     fi
 
-    if ! cmp --silent $VIDEO_SUSPEND $LOCATION_THROBBER_OLD; then
-      cp $VIDEO_SUSPEND $LOCATION_THROBBER_OLD
-    fi
-
-    if ! cmp --silent $VIDEO_SUSPEND $LOCATION_SUSPEND; then
-      cp $VIDEO_SUSPEND $LOCATION_SUSPEND
-    fi
-
     if ! cmp --silent $VIDEO_SUSPEND $LOCATION_THROBBER; then
       cp $VIDEO_SUSPEND $LOCATION_THROBBER
     fi
-
-    if ! cmp --silent $DECK_SUSPEND $LOCATION_SUSPEND_DECK; then
-      cp $DECK_SUSPEND $LOCATION_SUSPEND_DECK
-    fi
-
-    if ! cmp --silent $DECK_SUSPEND $LOCATION_THROBBER_DECK; then
-      cp $DECK_SUSPEND $LOCATION_THROBBER_DECK
-    fi
-
-    if ! cmp --silent $OLED_SUSPEND $LOCATION_SUSPEND_OLED; then
-      cp $OLED_SUSPEND $LOCATION_SUSPEND_OLED
+
+    if ! cmp --silent $VIDEO_SUSPEND $LOCATION_THROBBER_OLD; then
+      cp $VIDEO_SUSPEND $LOCATION_THROBBER_OLD
     fi
 
-    if ! cmp --silent $OLED_SUSPEND $LOCATION_THROBBER_OLED; then
-      cp $OLED_SUSPEND $LOCATION_THROBBER_OLED
-    fi
   fi
 
   # Required to maintain the Steam update branch between desktop & Steam Game Mode

diff --git a/system_files/desktop/shared/usr/share/ublue-os/topgrade.toml b/system_files/desktop/shared/usr/share/ublue-os/topgrade.toml
@@ -9,4 +9,5 @@ assume_yes = true
 no_retry = false
 
 [linux]
+bootc = false
 rpm_ostree = true