diff options
| -rw-r--r-- | system_files/usr/share/ublue-os/just/92-aerocore-decky-mirror.just | 10 | ||||
| -rwxr-xr-x | tests/test-decky-mirror-ujust.sh | 7 |
2 files changed, 15 insertions, 2 deletions
diff --git a/system_files/usr/share/ublue-os/just/92-aerocore-decky-mirror.just b/system_files/usr/share/ublue-os/just/92-aerocore-decky-mirror.just index df9b6d5..c8212eb 100644 --- a/system_files/usr/share/ublue-os/just/92-aerocore-decky-mirror.just +++ b/system_files/usr/share/ublue-os/just/92-aerocore-decky-mirror.just @@ -113,9 +113,15 @@ setup-decky-mirror ACTION="": echo "Uninstalling Decky Loader..." if [[ "$HAS_GRAPHICAL_SESSION" -eq 1 ]]; then curl -L "${DECKY_INSTALLER_BASE}/uninstall.sh" | - sed 's|sudo|sudo -A |g' | sh + sed -e 's|sudo|sudo -A |g' \ + -e 's|sudo -A rm "${HOMEBREW_FOLDER}/services/PluginLoader"|sudo -A rm -rf "${HOMEBREW_FOLDER}/services/PluginLoader"|' \ + -e 's|sudo -A rm "${USER_DIR}/.steam/steam/.cef-enable-remote-debugging"|sudo -A rm -f "${USER_DIR}/.steam/steam/.cef-enable-remote-debugging"|' \ + -e 's|sudo -A rm "${USER_DIR}/.var/app/com.valvesoftware.Steam/data/Steam/.cef-enable-remote-debugging"|sudo -A rm -f "${USER_DIR}/.var/app/com.valvesoftware.Steam/data/Steam/.cef-enable-remote-debugging"|' | sh else - curl -L "${DECKY_INSTALLER_BASE}/uninstall.sh" | sh + curl -L "${DECKY_INSTALLER_BASE}/uninstall.sh" | + sed -e 's|sudo rm "${HOMEBREW_FOLDER}/services/PluginLoader"|sudo rm -rf "${HOMEBREW_FOLDER}/services/PluginLoader"|' \ + -e 's|sudo rm "${USER_DIR}/.steam/steam/.cef-enable-remote-debugging"|sudo rm -f "${USER_DIR}/.steam/steam/.cef-enable-remote-debugging"|' \ + -e 's|sudo rm "${USER_DIR}/.var/app/com.valvesoftware.Steam/data/Steam/.cef-enable-remote-debugging"|sudo rm -f "${USER_DIR}/.var/app/com.valvesoftware.Steam/data/Steam/.cef-enable-remote-debugging"|' | sh fi echo "Decky Loader has been uninstalled." } diff --git a/tests/test-decky-mirror-ujust.sh b/tests/test-decky-mirror-ujust.sh index 125983b..6950c31 100755 --- a/tests/test-decky-mirror-ujust.sh +++ b/tests/test-decky-mirror-ujust.sh @@ -36,6 +36,13 @@ if ! rg -q 'loader\.json' "${recipe}" || ! rg -q '\.store = 2' "${recipe}" || ! exit 1 fi +if ! rg -q 'rm -rf.*HOMEBREW_FOLDER.*/services/PluginLoader' "${recipe}" || + ! rg -q 'rm -f.*USER_DIR.*/\.steam/steam/\.cef-enable-remote-debugging' "${recipe}" || + ! rg -q 'rm -f.*USER_DIR.*/\.var/app/com\.valvesoftware\.Steam/data/Steam/\.cef-enable-remote-debugging' "${recipe}"; then + echo "Decky mirror recipe must make uninstall safe for missing paths" >&2 + exit 1 +fi + for script_name in install_release.sh install_prerelease.sh uninstall.sh; do if ! rg -q "\\$\\{DECKY_INSTALLER_BASE\\}/${script_name}" "${recipe}"; then echo "Decky mirror recipe does not route ${script_name} through the mirror base" >&2 |