cleaned up scripts, use sh (-> dash) where possible

15 files changed, 22 insertions, 23 deletions

diff --git a/bin/guiscripts/dmclip b/bin/guiscripts/dmclip
index 9c09b04..a1ca634 100755
--- a/bin/guiscripts/dmclip
+++ b/bin/guiscripts/dmclip
@@ -9,7 +9,7 @@ NotImage () {
     exit
 }
 
-selection="$(echo -e "primary\nclipboard\nswap" | 
+selection="$(echo "primary\nclipboard\nswap" | 
 	dmenu -l 1 -g 3 -p "selection:")"
 if [[ "$selection" == "swap" ]]
 then
@@ -37,7 +37,7 @@ else
 		cut -c -"$DICL_LEN")"
 fi
 
-menu_option="$(echo -e "save\nload\nimage\nreplace" | 
+menu_option="$(echo "save\nload\nimage\nreplace" | 
 	dmenu -l 1 -g 4 -p "'$disp_clip'")"
 [ "${menu_option}" ] || exit
 
diff --git a/bin/guiscripts/dmdsktp b/bin/guiscripts/dmdsktp
index d0905b7..3711f13 100755
--- a/bin/guiscripts/dmdsktp
+++ b/bin/guiscripts/dmdsktp
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 # Searches through .desktop files and prompt to launch them via dmenu
 gtk-launch "$(find ~/.local/share/applications \
     -maxdepth 1 \
diff --git a/bin/guiscripts/dmemoji b/bin/guiscripts/dmemoji
index e9bd4f4..8225f12 100755
--- a/bin/guiscripts/dmemoji
+++ b/bin/guiscripts/dmemoji
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 # This files comes from:
 # https://github.com/porras/dmenu-emoji
 #
@@ -21,7 +21,7 @@ case "$1" in
     fi
     ;;
   "")
-    bash $0 list | dmenu -x -i -g 1 -l 20 -p 'Emoji:' | bash $0 copy
+    sh $0 list | dmenu -x -i -g 1 -l 20 -p 'Emoji:' | sh $0 copy
     ;;
 esac
 
diff --git a/bin/guiscripts/dmfm b/bin/guiscripts/dmfm
index 34a9e2c..969c111 100755
--- a/bin/guiscripts/dmfm
+++ b/bin/guiscripts/dmfm
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 file=1
 while [ "$file" ]; do
diff --git a/bin/guiscripts/dmhelp b/bin/guiscripts/dmhelp
index 653fa1f..6199c21 100755
--- a/bin/guiscripts/dmhelp
+++ b/bin/guiscripts/dmhelp
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 program="${1:-$(dmenu_path | dmenu -l 4 -g 5)}"
 opfil="/tmp/dmh_options.txt"
 test -z "${program}" && exit 1
diff --git a/bin/guiscripts/dminw b/bin/guiscripts/dminw
index 3ea5fb3..5066ca8 100755
--- a/bin/guiscripts/dminw
+++ b/bin/guiscripts/dminw
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 WINDOWID=${1:-$(xdotool getwindowfocus)}
 WIDTH=$(xdotool getwindowgeometry -s ${WINDOWID} | grep WIDTH | cut -d ' ' -f 2)
 dmenu_run -w ${1:-$(xdotool getwindowfocus)} -c
diff --git a/bin/guiscripts/dmlang b/bin/guiscripts/dmlang
index 0009704..0e9672e 100755
--- a/bin/guiscripts/dmlang
+++ b/bin/guiscripts/dmlang
@@ -1,7 +1,5 @@
-#!/usr/bin/env bash
-choice="$(\
-    echo -e "us\ngb\nbe" \
-        | dmenu \
-        -p "($(setxkbmap -query | awk 'NR==3 {print $2}'))" \
-)"
+#!/usr/bin/env sh
+choice="$(echo "us\ngb\nbe" | 
+	dmenu -p "($(setxkbmap -query |
+	awk 'NR==3 {print $2}'))")"
 setxkbmap "${choice:-us}"
diff --git a/bin/guiscripts/dmpass b/bin/guiscripts/dmpass
index 9d79660..bb7bee2 100755
--- a/bin/guiscripts/dmpass
+++ b/bin/guiscripts/dmpass
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 store="$HOME/.password-store"
 lscmd="ls --group-directories-first"
 dmenucmd="dmenu -l 4 -g 2"
diff --git a/bin/guiscripts/dmpassgen b/bin/guiscripts/dmpassgen
index c627a1d..12d911d 100755
--- a/bin/guiscripts/dmpassgen
+++ b/bin/guiscripts/dmpassgen
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 choice="$(echo -ne "multiline\nsingle" | dmenu -l 1 -g 2)"
 test -z "${choice}" && exit 1
 
@@ -12,7 +12,8 @@ then
     test -z "${login}" && exit 1
     url="$(echo -n "" | dmenu -p "url:")"
     test -z "${url}" && exit 1
-    echo -e "${password}\nlogin: ${login}\nurl: ${url}" | pass insert -mf "${password}"
+    echo "${password}\nlogin: ${login}\nurl: ${url}" |
+		pass insert -mf "${password}"
     pass generate -ci "${password}"
 else
     pass generate -cf "${password}"
diff --git a/bin/guiscripts/dmpdf b/bin/guiscripts/dmpdf
index 2d51760..e8d4601 100755
--- a/bin/guiscripts/dmpdf
+++ b/bin/guiscripts/dmpdf
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 tmp="/tmp/dmpdf"
 find ${1:-$HOME/docs $HOME/dl} 2> /dev/null | grep -E ".+\.pdf" | sort > "$tmp"
diff --git a/bin/guiscripts/dmpower b/bin/guiscripts/dmpower
index c6c7fe4..5c333a8 100755
--- a/bin/guiscripts/dmpower
+++ b/bin/guiscripts/dmpower
@@ -1,3 +1,3 @@
 #!/bin/sh
-choice="$(echo -e "poweroff\nreboot\nhibernate" | dmenu -l 1 -g 3)"
+choice="$(echo "poweroff\nreboot\nhibernate" | dmenu -l 1 -g 3)"
 test -z "$choice" || doas "$choice"
diff --git a/bin/guiscripts/dmvid b/bin/guiscripts/dmvid
index fe3155e..51971e6 100755
--- a/bin/guiscripts/dmvid
+++ b/bin/guiscripts/dmvid
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 
 find ${1:-~/vids ~/dl} 2> /dev/null | grep -E ".+\.(webm|mp4|mpeg|mkv)$" | sort > /tmp/dmvids
 
diff --git a/bin/guiscripts/dmvol b/bin/guiscripts/dmvol
index a73e128..8909de7 100755
--- a/bin/guiscripts/dmvol
+++ b/bin/guiscripts/dmvol
@@ -2,7 +2,7 @@
 while true
 do 
 	volume="$(mpc volume | awk '{print $2}' | cut -f1 -d'%')"
-	choice="$(echo -e "plus\nmin" |
+	choice="$(echo "plus\nmin" |
 		dmenu -g 2 -l 1 -p "$volume" |
 		sed 's/plus/+/;s/min/-/')"
 	test -z "$choice" && break
diff --git a/bin/guiscripts/dmyt-not b/bin/guiscripts/dmyt-not
index 4783a8d..293ddde 100755
--- a/bin/guiscripts/dmyt-not
+++ b/bin/guiscripts/dmyt-not
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 # Open a video from channels.yt-not by selecting the channel
 channel="$(awk '{print $2}' ~/.local/share/yt-not/channels.yt-not | dmenu -l 2 -g 4)"
 video_id="$(awk "/$channel/ {print \$3}" ~/.local/share/yt-not/channels.yt-not )"
diff --git a/bin/guiscripts/sturl b/bin/guiscripts/sturl
index bf1fb02..c738c8e 100755
--- a/bin/guiscripts/sturl
+++ b/bin/guiscripts/sturl
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 regex='(((https?|gopher|gemini|ftps?|git)://|www\.)[a-zA-Z0-9.]*[:;a-zA-Z0-9./+@$&%?$\#=_~-]*)|(magnet:\?xt=urn:btih:[a-zA-Z0-9]*)'
-url="$(cat | tr -d '\n' | grep -Eo "$regex" | dmenu -x -c -g 1 -l 10)"
+url="$(tr -d '\n' | grep -Eo "$regex" | dmenu -x -c -g 1 -l 10)"
 [ -z "$url" ] && exit 1
 
 case $1 in