From 20094c5f752046a33287ef372fa973e919e83226 Mon Sep 17 00:00:00 2001 From: "Derek J. Clark" Date: Mon, 8 Aug 2022 11:32:14 -0700 Subject: Use Environment Variables (#123) Uses environment variables instead of hard coding the "deck" user/group. This adds support for systems other than the steam deck that are using the DeckUI. * Use Environment Variables * Use method to get USER from a systemd root process * Fix imports. Add get_user and get_user_group methods in helpers.py. Removed duplicated code * Add separate setters/getters for user vars. Ensure sleep prevents race condition of user setter in while loop --- dist/uninstall.sh | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'dist/uninstall.sh') diff --git a/dist/uninstall.sh b/dist/uninstall.sh index a98ba0de..0680338d 100644 --- a/dist/uninstall.sh +++ b/dist/uninstall.sh @@ -1,17 +1,20 @@ #!/bin/sh +[ "$UID" -eq 0 ] || exec sudo "$0" "$@" + echo "Uninstalling Steam Deck Plugin Loader..." -HOMEBREW_FOLDER=/home/deck/homebrew +USER_DIR="$(getent passwd $SUDO_USER | cut -d: -f6)" +HOMEBREW_FOLDER="${USER_DIR}/homebrew" # Disable and remove services sudo systemctl disable --now plugin_loader.service > /dev/null -sudo rm -f /home/deck/.config/systemd/user/plugin_loader.service -sudo rm -f /etc/systemd/system/plugin_loader.service +sudo rm -f "${USER_DIR}/.config/systemd/user/plugin_loader.service" +sudo rm -f "/etc/systemd/system/plugin_loader.service" # Remove temporary folder if it exists from the install process -rm -rf /tmp/plugin_loader +rm -rf "/tmp/plugin_loader" # Cleanup services folder -sudo rm ${HOMEBREW_FOLDER}/services/PluginLoader +sudo rm "${HOMEBREW_FOLDER}/services/PluginLoader" -- cgit v1.2.3