From a9ac024fe9fa5e035cf3c26fa9e7e632af9e3177 Mon Sep 17 00:00:00 2001 From: Maarten van Gompel Date: Tue, 24 Aug 2021 23:11:58 +0200 Subject: [PATCH] use --index instead of -idx for compatibility with bemenu, requires similar patch for dmenu --- scripts/appscripts/sxmo_rss.sh | 2 +- scripts/core/sxmo_gpsutil.sh | 2 +- scripts/modem/sxmo_modemcall.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/appscripts/sxmo_rss.sh b/scripts/appscripts/sxmo_rss.sh index 2b5e022..3a4ad40 100755 --- a/scripts/appscripts/sxmo_rss.sh +++ b/scripts/appscripts/sxmo_rss.sh @@ -101,7 +101,7 @@ rssreadmenu() { DMENUIDX=1 while true; do # Show list of items - PICKED="$(printf %b "$CHOICES" | sxmo_dmenu.sh -ix $DMENUIDX -p "RSS ($TIMESPANABBR)" -fn Terminus-15)" + PICKED="$(printf %b "$CHOICES" | sxmo_dmenu.sh --index $DMENUIDX -p "RSS ($TIMESPANABBR)" -fn Terminus-15)" DMENUIDX="$(echo "$CHOICES" | grep -m1 -F -n "$PICKED" | cut -d ':' -f1)" if [ "$PICKED" = "Close Menu" ]; then die Closed Menu diff --git a/scripts/core/sxmo_gpsutil.sh b/scripts/core/sxmo_gpsutil.sh index e306532..79aef99 100755 --- a/scripts/core/sxmo_gpsutil.sh +++ b/scripts/core/sxmo_gpsutil.sh @@ -223,7 +223,7 @@ menumaptype() { CHOICE="$( echo "$CHOICES" | awk -F^ '{ print $1 }' | - dmenu -ix "$IDX" -p "Map Type" | + dmenu --index "$IDX" -p "Map Type" | awk '{$1=$1};1' )" echo "$CHOICE" | grep "Close Menu" && exit 0 diff --git a/scripts/modem/sxmo_modemcall.sh b/scripts/modem/sxmo_modemcall.sh index 7a3f604..61d7157 100755 --- a/scripts/modem/sxmo_modemcall.sh +++ b/scripts/modem/sxmo_modemcall.sh @@ -187,7 +187,7 @@ incallmenuloop() { cut -d'^' -f1 | sed '/^[[:space:]]*$/d' | awk '{$1=$1};1' | #this cryptic statement trims leading/trailing whitespace from a string - dmenu -idx $DMENUIDX "$([ "$WINDOWIFIED" = 0 ] && echo "" || echo "-wm")" -p "$NUMBER" | + dmenu --index $DMENUIDX "$([ "$WINDOWIFIED" = 0 ] && echo "" || echo "-wm")" -p "$NUMBER" | ( PICKED="$(cat)"; echo "sxmo_modemcall: Picked is $PICKED">&2