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

fix(default-flatpaks): Fix loginctl json parsing in F40 & less (systemd v255 & less)

Browse source
This commit is contained in:
fiftydinar 2024-10-25 23:02:40 +02:00 • committed by GitHub
parent ccde6df956
commit ca84ec87eb
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 32 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -177,32 +177,54 @@ MAINTAINER_REMOVE_LIST=$(comm -23 <(sort "$REMOVE_LIST_FILE") <(sort "$USER_INST
COMBINED_INSTALL_LIST=$(cat <(echo "$MAINTAINER_INSTALL_LIST") "$USER_INSTALL_LIST_FILE" | grep -v -E '^#|^$' | awk '!seen[$0]++')
COMBINED_REMOVE_LIST=$(cat <(echo "$MAINTAINER_REMOVE_LIST") "$USER_REMOVE_LIST_FILE" | grep -v -E '^#|^$' | awk '!seen[$0]++')
# Loginctl has different command for parsing json since v256 (F41), so handle that scenario here
LOGINCTL_VERSION=$(loginctl --version | awk 'NR==1 {print $2}')
function notify-send-pre-install {
user_name=$(loginctl list-users -j | jq -r '.[] | select(.state == "active") | .user')
uid=$(loginctl list-users -j | jq -r '.[] | select(.state == "active") | .uid')
if [[ ${LOGINCTL_VERSION} -ge 256 ]]; then
user_name=$(loginctl list-users -j | jq -r '.[] | select(.state == "active") | .user')
uid=$(loginctl list-users -j | jq -r '.[] | select(.state == "active") | .uid')
else
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')
fi
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 -j | jq -r '.[] | select(.state == "active") | .user')
uid=$(loginctl list-users -j | jq -r '.[] | select(.state == "active") | .uid')
if [[ ${LOGINCTL_VERSION} -ge 256 ]]; then
user_name=$(loginctl list-users -j | jq -r '.[] | select(.state == "active") | .user')
uid=$(loginctl list-users -j | jq -r '.[] | select(.state == "active") | .uid')
else
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')
fi
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 -j | jq -r '.[] | select(.state == "active") | .user')
uid=$(loginctl list-users -j | jq -r '.[] | select(.state == "active") | .uid')
if [[ ${LOGINCTL_VERSION} -ge 256 ]]; then
user_name=$(loginctl list-users -j | jq -r '.[] | select(.state == "active") | .user')
uid=$(loginctl list-users -j | jq -r '.[] | select(.state == "active") | .uid')
else
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')
fi
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 -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
if [[ ${LOGINCTL_VERSION} -ge 256 ]]; then
user_name=$(loginctl list-users -j | jq -r '.[] | select(.state == "active") | .user')
uid=$(loginctl list-users -j | jq -r '.[] | select(.state == "active") | .uid')
else
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')
fi
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
}
# Remove flatpaks in list