Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make DBUS session check more resilient #684

Merged
merged 1 commit into from
Apr 7, 2021
Merged

Make DBUS session check more resilient #684

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions dom0/update-xfce-settings
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,11 @@ set -e
set -u
set -o pipefail

if [[ $EUID -eq 0 ]]; then
echo "This script should not be run as root; it must be run as a user with an active login session."
exit 1
fi

TASK=${1:-none}
ICONSIZE=64

Expand All @@ -23,10 +28,7 @@ fi

# This script requires a valid DBUS session to work. When run non-interactively,
# we assume that a sesssion is running for the current user.
if [ -z "${DBUS_SESSION_BUS_ADDRESS:-}" ]; then
export DBUS_SESSION_BUS_ADDRESS="unix:path=/run/user/$(id -u)/bus"
fi

export DBUS_SESSION_BUS_ADDRESS="unix:path=/run/user/$(id -u $USER)/bus"

if [[ $TASK == "disable-unsafe-power-management" ]]; then
echo "update-xfce-settings: Disabling unsafe power management options for user $USER"
Expand Down