Adjusted the log monitor target for recent versions of YAD.

jlesage · Jun 29, 2020 · 3b217e6 · 3b217e6
1 parent 714b30d
commit 3b217e6
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/rootfs/etc/logmonitor/targets.d/yad/send b/rootfs/etc/logmonitor/targets.d/yad/send
@@ -4,7 +4,7 @@ set -e # Exit immediately if a command exits with a non-zero status.
 set -u # Treat unset variables as an error.
 
 TITLE="$1"
-MSG="$2"
+MSG="$(echo "$2" | fold -w 80 -s)"
 LEVEL="$3"
 
 YAD="$(which yad)"
@@ -15,6 +15,12 @@ if [ "${YAD:-UNSET}" != "UNSET" ]; then
     export XDG_CONFIG_HOME="$XDG_BASE/xdg/config"
     export XDG_CACHE_HOME="$XDG_BASE/xdg/cache"
 
+    if [ "$(yad --version | cut -d'.' -f1)" = "0" ]; then
+        BUTTON_NAME="gtk-ok"
+    else
+        BUTTON_NAME="yad-ok"
+    fi
+
     yad \
         --fixed \
         --center \
@@ -26,7 +32,7 @@ if [ "${YAD:-UNSET}" != "UNSET" ]; then
         --text "<b>$TITLE</b>" \
         --form \
         --field "$MSG:LBL" \
-        --button=gtk-ok:0 > /dev/null || true
+        --button=$BUTTON_NAME:0 > /dev/null || true
 
     rm -r "$XDG_BASE"
 fi