Merge branch 'main' into testing

ublue-os · May 11, 2024 · 295ccec · 295ccec
2 parents 9f56df2 + 6181223
commit 295ccec
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/system_files/deck/shared/usr/lib/systemd/system/batterylimit.service b/system_files/deck/shared/usr/lib/systemd/system/batterylimit.service
@@ -7,4 +7,4 @@ EnvironmentFile=-/etc/default/%p
 ExecStart=/usr/bin/bash -c "echo ${MAX_BATTERY_CHARGE_LEVEL} > /sys/class/hwmon/hwmon*/max_battery_charge_level"
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=multi-user.target reboot.target hibernate.target hybrid-sleep.target sleep.target suspend-then-hibernate.target suspend.target
diff --git a/system_files/deck/shared/usr/share/ublue-os/just/85-bazzite-image.just b/system_files/deck/shared/usr/share/ublue-os/just/85-bazzite-image.just
@@ -34,8 +34,8 @@ install-hhd-xbox-glyph-theme:
 install-hhd-controller-glyph-theme:
     #!/usr/bin/bash
     if [ -d "$HOME/homebrew/themes" ]; then
-        rm -rf "$HOME/homebrew/themes/Handheld-Controller-Glyphs"
-        git clone https://github.com/victor-borges/handheld-controller-glyphs.git --single-branch "$HOME/homebrew/themes/Handheld-Controller-Glyphs"
+        rm -rf "$HOME/homebrew/themes/handheld-controller-glyphs"
+        git clone https://github.com/victor-borges/handheld-controller-glyphs.git --single-branch "$HOME/homebrew/themes/handheld-controller-glyphs"
     else
         echo 'Please install Decky Loader & CSS Loader first'
     fi

diff --git a/system_files/desktop/shared/usr/lib/systemd/system/[email protected] b/system_files/desktop/shared/usr/lib/systemd/system/[email protected]
@@ -10,7 +10,7 @@ ExecCondition=sh -c '[ "$(stat -f -c "%%T" "$1")" = btrfs ]' _ %f/
 ExecStartPre=-find %f/ -mindepth 1 -maxdepth 1 -mtime +14 -name .duperemove.hash -exec rm -f '{}' \;
 ExecStartPre=-cp -a %f/.duperemove.hash duperemove.hash
 ExecStartPre=-compsize %f/
-ExecStart=-sh -c '[ "$(sqlite3 -readonly duperemove.hash "SELECT keyval FROM config where keyname=''version_major''")" -ge 4 ] || rm -f duperemove.hash'
+ExecStart=-sh -c "[ $(sqlite3 -readonly duperemove.hash \"SELECT keyval FROM config where keyname == 'version_major'\") -ge 4 ] || rm -f duperemove.hash"
 ExecStart=duperemove -r -d -h -q --hashfile=duperemove.hash --skip-zeroes --exclude="%f/.duperemove.hash" --exclude="%f/@swapfile/swapfile" %f/
 ExecStartPost=-compsize %f/
 ExecStopPost=-cp -a duperemove.hash %f/.duperemove.hash

diff --git a/system_files/desktop/shared/usr/libexec/topgrade/third-party-css-loader-update b/system_files/desktop/shared/usr/libexec/topgrade/third-party-css-loader-update
@@ -36,9 +36,9 @@ if [ -d "$HOME/homebrew/themes/PS5-to-Xbox-glyphs/.git" ]; then
 fi
 
 # Handheld Controller Glyphs
-if [ -d "$HOME/homebrew/themes/Handheld-Controller-Glyphs/.git" ]; then
-  cd "$HOME/homebrew/themes/Handheld-Controller-Glyphs"
-  echo "Handheld-Controller-Glyphs theme found, pulling latest with git."
+if [ -d "$HOME/homebrew/themes/handheld-controller-glyphs/.git" ]; then
+  cd "$HOME/homebrew/themes/handheld-controller-glyphs"
+  echo "handheld-controller-glyphs theme found, pulling latest with git."
   git pull
   echo "Update complete."
 fi