made scripts MENUCMD sensitive

3 files changed, 61 insertions, 13 deletions

diff --git a/bin/guiscripts/dmapimg b/bin/guiscripts/dmapimg
index 3677ed3..151b8d0 100755
--- a/bin/guiscripts/dmapimg
+++ b/bin/guiscripts/dmapimg
@@ -1,7 +1,17 @@
 #!/bin/sh
-dest="$XDG_DATA_HOME"/appimages/
-appimage="$(\
-  find "$dest" -type f -printf "%f\n" \
-  | sed 's/\.[Aa]pp[Ii]mage$//g' \
-  | dmenu -x -l 10 -g 1 -p "AppImage:")"
-setsid "${dest}/${appimage:-NOSEL}"*
+
+if [ -z "$MENUCMD" ]
+then
+	menucmd="fzf"
+elif [ "$MENUCMD" = "tofi" ]
+then
+	menucmd='tofi --width 700 --height 300 --prompt-text Appimage:'
+else
+	menucmd="dmenu -x -l 10 -g 1 -p Appimage:"
+fi
+
+dest="$XDG_DATA_HOME"/appimages
+appimage="$(find "$dest" -type f -printf "%f\n" |
+	sed 's/\.[Aa]pp[Ii]mage$//g' |
+	$menucmd)"
+setsid "$dest/${appimage:-NOSEL}"*
diff --git a/bin/guiscripts/dmpassgen b/bin/guiscripts/dmpassgen
index d193998..a60112b 100755
--- a/bin/guiscripts/dmpassgen
+++ b/bin/guiscripts/dmpassgen
@@ -1,17 +1,44 @@
 #!/usr/bin/env sh
-choice="$(echo "multiline\nsingle" | dmenu -l 1 -g 2)"
+
+input ()
+{
+	# menu prompt for output
+	if [ "$MENUCMD" = "tofi" ]
+	then
+		inp="$(tofi --prompt-text "$1 " </dev/null)"
+	elif [ "$MENUCMD" = "dmenu" ]
+	then
+		inp="$(dmenu -p "$1" < /dev/null)"
+	else
+		echo -n "$1:" >&2
+		read inp
+	fi
+	echo $inp
+}
+# menu select long
+if [ "$MENUCMD" = "tofi" ]
+then
+	menucmd="tofi --prompt login:"
+elif [ "$MENUCMD" = "dmenu" ]
+then
+	menucmd="dmenu -l 10 -g 1 -x -i -p login:" 
+else
+	menucmd="fzf"
+fi
+
+choice="$(echo "multiline\nsingle" | $MENUCMD)"
 test -z "${choice}" && exit 1
 
-password="$(dmenu -p "name:" </dev/null)"
+password="$(input "name:")"
 test -z "${password}" && exit 1
 
 if [ "${choice}" = "multiline" ]
 then
 	login="$(ls -1 ~/.password-store/e-mails |
 		sed 's/\.gpg$//' | 
-		dmenu -g 1 -l 8 -p "login:")"
+		$menucmd)"
     test -z "${login}" && exit 1
-    url="$(dmenu -p "url:" </dev/null)"
+    url="$(input "url:")"
     test -z "${url}" && exit 1
     echo "${password}\nlogin: ${login}\nurl: ${url}" |
 		pass insert -mf "${password}"
@@ -19,4 +46,3 @@ then
 else
     pass generate -cf "${password}"
 fi
-
diff --git a/bin/guiscripts/dmvid b/bin/guiscripts/dmvid
index 23e2c56..a31a221 100755
--- a/bin/guiscripts/dmvid
+++ b/bin/guiscripts/dmvid
@@ -1,12 +1,24 @@
 #!/usr/bin/env sh
 
-find ${1:-~/vids ~/dl} 2> /dev/null |
+dirs="${1:-$HOME/vids $HOME/dl}"
+find -L $dirs 2> /dev/null |
 	grep ".\+\.\(webm\|mp4\|mpeg\|mkv\)$" |
 	sort > /tmp/dmvids
+cat /tmp/dmvids
+
+if [ "$MENUCMD" = "tofi" ]
+then
+	menucmd="tofi --width 30% --height 30%"
+elif [ "$MENUCMD" = "dmenu" ]
+then
+	menucmd="dmenu -l 10 -g 1 -x -i" 
+else
+	menucmd="fzf"
+fi
 
 choice="$(sed 's|^/home/aluc|\~| ; s|\([^/]\)[^/]*/|\1/|g' /tmp/dmvids | 
 	awk '{printf "%s %s\n", NR ":", $0}' | 
-	dmenu -l 10 -g 1 -x -i | 
+	$menucmd | 
 	cut -f 1 -d ':')"
 test -z "$choice" &&
 	exit 1