particle-os/particle-os-modules
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(default-flatpaks): loginctl regression in parsing json output for notifications

Browse source 
On Fedora 41, which has systemd v256, `--output=json` no longer displays `json`, but classic output.

Using `-j` instead of `--output=json` fixes this issue.
This commit is contained in:
fiftydinar 2024-10-25 22:51:51 +02:00 • committed by GitHub
parent 247a99e42a
commit ccde6df956
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
modules/default-flatpaks/v1/system-flatpak-setup
View file

@ -178,29 +178,29 @@ COMBINED_INSTALL_LIST=$(cat <(echo "$MAINTAINER_INSTALL_LIST") "$USER_INSTALL_LI
COMBINED_REMOVE_LIST=$(cat <(echo "$MAINTAINER_REMOVE_LIST") "$USER_REMOVE_LIST_FILE" | grep -v -E '^#|^$' | awk '!seen[$0]++')
function notify-send-pre-install {
user_name=$(loginctl list-users --output=json | jq -r '.[] | select(.state == "active") | .user')
uid=$(loginctl list-users --output=json | jq -r '.[] | select(.state == "active") | .uid')
user_name=$(loginctl list-users -j | jq -r '.[] | select(.state == "active") | .user')
uid=$(loginctl list-users -j | jq -r '.[] | select(.state == "active") | .uid')
xdg_runtime_path="/run/user/$uid"
sudo -u "$user_name" DBUS_SESSION_BUS_ADDRESS=unix:path="$xdg_runtime_path"/bus notify-send "Flatpak Installer" "Started install of system flatpaks" --app-name="Flatpak Installer" -u NORMAL
}
function notify-send-install {
user_name=$(loginctl list-users --output=json | jq -r '.[] | select(.state == "active") | .user')
uid=$(loginctl list-users --output=json | jq -r '.[] | select(.state == "active") | .uid')
user_name=$(loginctl list-users -j | jq -r '.[] | select(.state == "active") | .user')
uid=$(loginctl list-users -j | jq -r '.[] | select(.state == "active") | .uid')
xdg_runtime_path="/run/user/$uid"
sudo -u "$user_name" DBUS_SESSION_BUS_ADDRESS=unix:path="$xdg_runtime_path"/bus notify-send "Flatpak Installer" "Finished install of system flatpaks:\n$INSTALL_LIST" --app-name="Flatpak Installer" -u NORMAL
}
function notify-send-pre-uninstall {
user_name=$(loginctl list-users --output=json | jq -r '.[] | select(.state == "active") | .user')
uid=$(loginctl list-users --output=json | jq -r '.[] | select(.state == "active") | .uid')
user_name=$(loginctl list-users -j | jq -r '.[] | select(.state == "active") | .user')
uid=$(loginctl list-users -j | jq -r '.[] | select(.state == "active") | .uid')
xdg_runtime_path="/run/user/$uid"
sudo -u "$user_name" DBUS_SESSION_BUS_ADDRESS=unix:path="$xdg_runtime_path"/bus notify-send "Flatpak Installer" "Started uninstall of some system flatpaks" --app-name="Flatpak Installer" -u NORMAL
}
function notify-send-uninstall {
user_name=$(loginctl list-users --output=json | jq -r '.[] | select(.state == "active") | .user')
uid=$(loginctl list-users --output=json | jq -r '.[] | select(.state == "active") | .uid')
user_name=$(loginctl list-users -j | jq -r '.[] | select(.state == "active") | .user')
uid=$(loginctl list-users -j | jq -r '.[] | select(.state == "active") | .uid')
xdg_runtime_path="/run/user/$uid"
sudo -u "$user_name" DBUS_SESSION_BUS_ADDRESS=unix:path="$xdg_runtime_path"/bus notify-send "Flatpak Installer" "Finished uninstall of system flatpaks:\n$REMOVE_LIST" --app-name="Flatpak Installer" -u NORMAL
}