From 42feda400d8fd77e460aacca9e99af70c188b7c9 Mon Sep 17 00:00:00 2001
From: zachir <zachir@librem.one>
Date: Mon, 27 Feb 2023 00:14:25 -0600
Subject: Add check to determine display server without flags

---
 bsc | 13 +++++++++++++
 fdc | 13 +++++++++++++
 ffc | 13 +++++++++++++
 lwc | 13 +++++++++++++
 qbc | 13 +++++++++++++
 5 files changed, 65 insertions(+)

diff --git a/bsc b/bsc
index 8302d3b..5fec72b 100755
--- a/bsc
+++ b/bsc
@@ -21,6 +21,19 @@ while getopts "hwxd:u:" o; do case "${o}" in
 esac done
 #}}}
 
+#{{{ Check display server if -w or -x not provided
+if [ -z "$DMENU" ]; then
+  if [ -n "$WAYLAND_DISPLAY" ]; then
+    DMENU="bemenu"
+  elif [ -n "$DISPLAY" ]; then
+    DMENU="dmene"
+  else
+    print "Can't tell if Wayland or X; what gives?\n"
+    exit 1
+  fi
+fi
+#}}}
+
 #{{{ Choose Profiles
 PROFILES=`grep 'Path=' ~/.moonchild\ productions/basilisk/profiles.ini | cut -d'.' -f2`
 CHOSEN=`echo "$PROFILES" | $DMENU -p "basilisk" -l 15 $DMENU_ARGS`
diff --git a/fdc b/fdc
index 2ad7b61..3c3a6bf 100755
--- a/fdc
+++ b/fdc
@@ -21,6 +21,19 @@ while getopts "hwxd:u:" o; do case "${o}" in
 esac done
 #}}}
 
+#{{{ Check display server if -w or -x not provided
+if [ -z "$DMENU" ]; then
+  if [ -n "$WAYLAND_DISPLAY" ]; then
+    DMENU="bemenu"
+  elif [ -n "$DISPLAY" ]; then
+    DMENU="dmene"
+  else
+    print "Can't tell if Wayland or X; what gives?\n"
+    exit 1
+  fi
+fi
+#}}}
+
 #{{{ Choose Profiles
 PROFILES=`grep 'Path=' ~/.firedragon/profiles.ini | cut -d'.' -f2`
 CHOSEN=`echo "$PROFILES" | $DMENU -p "firedragon" -l 15 $DMENU_ARGS`
diff --git a/ffc b/ffc
index fd004be..117523c 100755
--- a/ffc
+++ b/ffc
@@ -21,6 +21,19 @@ while getopts "hwxd:u:" o; do case "${o}" in
 esac done
 #}}}
 
+#{{{ Check display server if -w or -x not provided
+if [ -z "$DMENU" ]; then
+  if [ -n "$WAYLAND_DISPLAY" ]; then
+    DMENU="bemenu"
+  elif [ -n "$DISPLAY" ]; then
+    DMENU="dmene"
+  else
+    print "Can't tell if Wayland or X; what gives?\n"
+    exit 1
+  fi
+fi
+#}}}
+
 #{{{ Native Profiles
 if [ -f ~/.mozilla/firefox/profiles.ini ]; then
   NATIVE_PROFILES=`grep 'Path=' ~/.mozilla/firefox/profiles.ini | cut -d'.' -f2`
diff --git a/lwc b/lwc
index ae472c8..29daf45 100755
--- a/lwc
+++ b/lwc
@@ -21,6 +21,19 @@ while getopts "hwxd:u:" o; do case "${o}" in
 esac done
 #}}}
 
+#{{{ Check display server if -w or -x not provided
+if [ -z "$DMENU" ]; then
+  if [ -n "$WAYLAND_DISPLAY" ]; then
+    DMENU="bemenu"
+  elif [ -n "$DISPLAY" ]; then
+    DMENU="dmene"
+  else
+    print "Can't tell if Wayland or X; what gives?\n"
+    exit 1
+  fi
+fi
+#}}}
+
 #{{{ Native Profiles
 if [ -f ~/.librewolf/profiles.ini ]; then
   NATIVE_PROFILES=`grep 'Path=' ~/.librewolf/profiles.ini | cut -d'.' -f2`
diff --git a/qbc b/qbc
index 402481c..e96ab84 100755
--- a/qbc
+++ b/qbc
@@ -21,6 +21,19 @@ while getopts "hwxd:u:" o; do case "${o}" in
 esac done
 #}}}
 
+#{{{ Check display server if -w or -x not provided
+if [ -z "$DMENU" ]; then
+  if [ -n "$WAYLAND_DISPLAY" ]; then
+    DMENU="bemenu"
+  elif [ -n "$DISPLAY" ]; then
+    DMENU="dmene"
+  else
+    print "Can't tell if Wayland or X; what gives?\n"
+    exit 1
+  fi
+fi
+#}}}
+
 #{{{ Get Sessions
 SESSIONS=`qbpm list`
 [ -z "$SESSIONS" ] && qutebrowser $@ && exit
-- 
cgit v1.2.3