chore(default-flatpaks): No need to query DISPLAY variable for `not…

…ify-send` Notifications work without it & custom images without XWayland don't have `DISPLAY` variable at all (eg. secureblue & custom images based on it)
blue-build · Oct 23, 2024 · 89ea220 · 89ea220
1 parent 7d08c2e
commit 89ea220
Showing 1 changed file with 4 additions and 8 deletions.
diff --git a/modules/default-flatpaks/v1/system-flatpak-setup b/modules/default-flatpaks/v1/system-flatpak-setup
@@ -157,32 +157,28 @@ 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')
      xdg_runtime_path="/run/user/$uid"
-     display_var=$(printenv DISPLAY)
-     sudo -u "$user_name" DBUS_SESSION_BUS_ADDRESS=unix:path="$xdg_runtime_path"/bus DISPLAY="$display_var" notify-send "Flatpak Installer" "Started install of system flatpaks" --app-name="Flatpak Installer" -u NORMAL
+     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')
      xdg_runtime_path="/run/user/$uid"
-     display_var=$(printenv DISPLAY)
-     sudo -u "$user_name" DBUS_SESSION_BUS_ADDRESS=unix:path="$xdg_runtime_path"/bus DISPLAY="$display_var" notify-send "Flatpak Installer" "Finished install of system flatpaks:\n$INSTALL_LIST" --app-name="Flatpak Installer" -u NORMAL
+     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')
      xdg_runtime_path="/run/user/$uid"
-     display_var=$(printenv DISPLAY)      
-     sudo -u "$user_name" DBUS_SESSION_BUS_ADDRESS=unix:path="$xdg_runtime_path"/bus DISPLAY="$display_var" notify-send "Flatpak Installer" "Started uninstall of some system flatpaks" --app-name="Flatpak Installer" -u NORMAL
+     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')
       xdg_runtime_path="/run/user/$uid"
-      display_var=$(printenv DISPLAY)      
-      sudo -u "$user_name" DBUS_SESSION_BUS_ADDRESS=unix:path="$xdg_runtime_path"/bus DISPLAY="$display_var" notify-send "Flatpak Installer" "Finished uninstall of system flatpaks:\n$REMOVE_LIST" --app-name="Flatpak Installer" -u NORMAL
+      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
 }
 
 # Install flatpaks in list