From e1972ab14f351f2241d3ab12fb76f5da1dad5f1c Mon Sep 17 00:00:00 2001
From: Aminda Suomalainen <suomalainen@aminda.eu>
Date: Thu, 10 Jul 2025 17:37:10 +0300
Subject: [PATCH] darkman: simpligy the qtdbus mess

---
 .../share/dark-mode.d/00-do-not-repeat-yourself.bash |  8 ++++++++
 local/share/dark-mode.d/15-wallpaper-dark.bash       | 12 ++----------
 local/share/light-mode.d/15-wallpaper-light.bash     | 12 ++----------
 3 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/local/share/dark-mode.d/00-do-not-repeat-yourself.bash b/local/share/dark-mode.d/00-do-not-repeat-yourself.bash
index 90e5fc2c..1ebef8d3 100755
--- a/local/share/dark-mode.d/00-do-not-repeat-yourself.bash
+++ b/local/share/dark-mode.d/00-do-not-repeat-yourself.bash
@@ -19,3 +19,11 @@ else
 	echo "$ERRORMESSAGE"
 	notify-send --app-name="darkman" --icon=error "$ERRORMESSAGE"
 fi
+
+if hash qdbus-qt6 2> /dev/null; then
+	QTDBUSBIN=qdbus-qt6
+elif hash qdbus6 2> /dev/null; then
+	QTDBUSBIN=qdbus6
+else
+	QTDBUSBIN=qdbus
+fi
diff --git a/local/share/dark-mode.d/15-wallpaper-dark.bash b/local/share/dark-mode.d/15-wallpaper-dark.bash
index 44987ade..f287af11 100755
--- a/local/share/dark-mode.d/15-wallpaper-dark.bash
+++ b/local/share/dark-mode.d/15-wallpaper-dark.bash
@@ -12,13 +12,5 @@ fi
 
 echo "Wallpaper: $WALLPAPER_PATH"
 
-if hash qdbus-qt6 2> /dev/null; then
-	qdbus-qt6 org.kde.plasmashell /PlasmaShell org.kde.PlasmaShell.evaluateScript 'var allDesktops = desktops();print (allDesktops);for (i=0;i<allDesktops.length;i++) {d = allDesktops[i];d.wallpaperPlugin = "org.kde.image";d.currentConfigGroup = Array("Wallpaper", "org.kde.image", "General");d.writeConfig("Image", "file://'$WALLPAPER_PATH'")}'
-	qdbus-qt6 org.kde.Solid.PowerManagement /org/kde/Solid/PowerManagement/Actions/BrightnessControl org.kde.Solid.PowerManagement.Actions.BrightnessControl.setBrightness 512
-elif hash qdbus6 2> /dev/null; then
-	qdbus6 org.kde.plasmashell /PlasmaShell org.kde.PlasmaShell.evaluateScript 'var allDesktops = desktops();print (allDesktops);for (i=0;i<allDesktops.length;i++) {d = allDesktops[i];d.wallpaperPlugin = "org.kde.image";d.currentConfigGroup = Array("Wallpaper", "org.kde.image", "General");d.writeConfig("Image", "file://'$WALLPAPER_PATH'")}'
-	qdbus6 org.kde.Solid.PowerManagement /org/kde/Solid/PowerManagement/Actions/BrightnessControl org.kde.Solid.PowerManagement.Actions.BrightnessControl.setBrightness 512
-else
-	qdbus org.kde.plasmashell /PlasmaShell org.kde.PlasmaShell.evaluateScript 'var allDesktops = desktops();print (allDesktops);for (i=0;i<allDesktops.length;i++) {d = allDesktops[i];d.wallpaperPlugin = "org.kde.image";d.currentConfigGroup = Array("Wallpaper", "org.kde.image", "General");d.writeConfig("Image", "file://'$WALLPAPER_PATH'")}'
-	qdbus org.kde.Solid.PowerManagement /org/kde/Solid/PowerManagement/Actions/BrightnessControl org.kde.Solid.PowerManagement.Actions.BrightnessControl.setBrightness 512
-fi
+$QTDBUSBIN org.kde.plasmashell /PlasmaShell org.kde.PlasmaShell.evaluateScript 'var allDesktops = desktops();print (allDesktops);for (i=0;i<allDesktops.length;i++) {d = allDesktops[i];d.wallpaperPlugin = "org.kde.image";d.currentConfigGroup = Array("Wallpaper", "org.kde.image", "General");d.writeConfig("Image", "file://'$WALLPAPER_PATH'")}'
+$QTDBUSBIN org.kde.Solid.PowerManagement /org/kde/Solid/PowerManagement/Actions/BrightnessControl org.kde.Solid.PowerManagement.Actions.BrightnessControl.setBrightness 512
diff --git a/local/share/light-mode.d/15-wallpaper-light.bash b/local/share/light-mode.d/15-wallpaper-light.bash
index 1bd39ccd..dd205070 100755
--- a/local/share/light-mode.d/15-wallpaper-light.bash
+++ b/local/share/light-mode.d/15-wallpaper-light.bash
@@ -12,13 +12,5 @@ fi
 
 echo "Wallpaper: $WALLPAPER_PATH"
 
-if hash qdbus-qt6 2> /dev/null; then
-	qdbus-qt6 org.kde.plasmashell /PlasmaShell org.kde.PlasmaShell.evaluateScript 'var allDesktops = desktops();print (allDesktops);for (i=0;i<allDesktops.length;i++) {d = allDesktops[i];d.wallpaperPlugin = "org.kde.image";d.currentConfigGroup = Array("Wallpaper", "org.kde.image", "General");d.writeConfig("Image", "file://'$WALLPAPER_PATH'")}'
-	qdbus-qt6 org.kde.Solid.PowerManagement /org/kde/Solid/PowerManagement/Actions/BrightnessControl org.kde.Solid.PowerManagement.Actions.BrightnessControl.setBrightness 512
-elif hash qdbus6 2> /dev/null; then
-	qdbus6 org.kde.plasmashell /PlasmaShell org.kde.PlasmaShell.evaluateScript 'var allDesktops = desktops();print (allDesktops);for (i=0;i<allDesktops.length;i++) {d = allDesktops[i];d.wallpaperPlugin = "org.kde.image";d.currentConfigGroup = Array("Wallpaper", "org.kde.image", "General");d.writeConfig("Image", "file://'$WALLPAPER_PATH'")}'
-	qdbus6 org.kde.Solid.PowerManagement /org/kde/Solid/PowerManagement/Actions/BrightnessControl org.kde.Solid.PowerManagement.Actions.BrightnessControl.setBrightness 512
-else
-	qdbus org.kde.plasmashell /PlasmaShell org.kde.PlasmaShell.evaluateScript 'var allDesktops = desktops();print (allDesktops);for (i=0;i<allDesktops.length;i++) {d = allDesktops[i];d.wallpaperPlugin = "org.kde.image";d.currentConfigGroup = Array("Wallpaper", "org.kde.image", "General");d.writeConfig("Image", "file://'$WALLPAPER_PATH'")}'
-	qdbus org.kde.Solid.PowerManagement /org/kde/Solid/PowerManagement/Actions/BrightnessControl org.kde.Solid.PowerManagement.Actions.BrightnessControl.setBrightness 512
-fi
+$QTDBUSBIN org.kde.plasmashell /PlasmaShell org.kde.PlasmaShell.evaluateScript 'var allDesktops = desktops();print (allDesktops);for (i=0;i<allDesktops.length;i++) {d = allDesktops[i];d.wallpaperPlugin = "org.kde.image";d.currentConfigGroup = Array("Wallpaper", "org.kde.image", "General");d.writeConfig("Image", "file://'$WALLPAPER_PATH'")}'
+$QTDBUSBIN org.kde.Solid.PowerManagement /org/kde/Solid/PowerManagement/Actions/BrightnessControl org.kde.Solid.PowerManagement.Actions.BrightnessControl.setBrightness 512