change dmenu books, mount/umount, unicode to use bemenu and not need -w -x flag

1 files changed, 13 insertions, 2 deletions

diff --git a/dmenuunicode b/dmenuunicode
index d994614..1358fad 100755
--- a/dmenuunicode
+++ b/dmenuunicode
@@ -7,14 +7,25 @@ printhelp () {
 }
 
 while getopts "hwxd:" o; do case "${o}" in
-  w) DMENU="tofi" ;;
+  w) DMENU="bemenu" ;;
   x) DMENU="dmenu" ;;
   d) ARGS="$ARGS$OPTARG " ;;
   *) printhelp ;;
 esac done
 
+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 user selection via dmenu -i -l 30 from emoji file.
-chosen=$(cut -d ';' -f1 ~/.local/share/larbs/chars/* | $DMENU $ARGS | sed "s/ .*//")
+chosen=$(cut -d ';' -f1 ~/.local/share/larbs/chars/* | $DMENU -l 10 $ARGS | sed "s/ .*//")
 
 # Exit if none chosen.
 [ -z "$chosen" ] && exit