sh compatibility in minor scripts

5 files changed, 15 insertions, 17 deletions

diff --git a/.scripts/lockscreen b/.scripts/lockscreen
index bbc16b5..817b8d0 100755
--- a/.scripts/lockscreen
+++ b/.scripts/lockscreen
@@ -1,19 +1,19 @@
-#!/bin/bash
+#!/bin/sh
 
 rm -f /tmp/locked.png
 
 # If `imagemagick` is not installed, use a blank screen.
-[[ -f /usr/bin/convert ]] &&
+[ -f /usr/bin/convert ] &&
 scrot -m -z /tmp/base.png &&
 pgrep -x dunst && notify-send -i ~/.scripts/lock.png "Locking computer..." &&
 convert /tmp/base.png -blur 0x8 /tmp/locked.png
 
 # Pause music (mocp, mpd and send the pause key to all mpv videos):
-mocp -P &>/dev/null
-mpc pause &>/dev/null
-pauseallmpv &>/dev/null
+mocp -P >/dev/null 2>&1
+mpc pause >/dev/null 2>&1
+pauseallmpv >/dev/null 2>&1
 
 i3lock -e -f -c 000000 -i /tmp/locked.png
 
 # In five seconds, turn off display unless key press in last 4 seconds.
-sleep 5 && [[ 4000 -lt $(xssstate -i) ]] &&  pgrep -x i3lock && xset dpms force off
+sleep 5 && [ 4000 -lt "$(xssstate -i)" ] &&  pgrep -x i3lock && xset dpms force off
diff --git a/.scripts/opout b/.scripts/opout
index 91323a5..374b57e 100755
--- a/.scripts/opout
+++ b/.scripts/opout
@@ -1,13 +1,11 @@
-#!/bin/bash
+#!/bin/sh
 # opout: "open output": A general handler for opening a file's intended output.
 # I find this useful especially running from vim.
 
-filename=$(readlink -f "$1")
-ext="${filename##*.}"
-filename="${filename%.*}"
+basename="${1%.*}"
 
-case "$ext" in
-	tex|md|rmd) setsid zathura "$filename".pdf & ;;
-	html) setsid $TRUEBROWSER --new-window "$filename".html & ;;
-	sent) setsid sent "$1" & ;;
+case "$1" in
+	*.tex|*.md|*.rmd) setsid zathura "$basename".pdf & ;;
+	*.html) setsid "$TRUEBROWSER" --new-window "$basename".html & ;;
+	*.sent) setsid sent "$1" & ;;
 esac
diff --git a/.scripts/pauseallmpv b/.scripts/pauseallmpv
index b24f448..08241b5 100755
--- a/.scripts/pauseallmpv
+++ b/.scripts/pauseallmpv
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 # Sends a , key to all mpv instances, pausing them at the last frame.
 
 xdotool search --class mpv | xargs -I % xdotool key --window % comma
diff --git a/.scripts/popweather b/.scripts/popweather
index fa946f0..d11bdf5 100755
--- a/.scripts/popweather
+++ b/.scripts/popweather
@@ -1,2 +1,2 @@
-#!/bin/bash
+#!/bin/sh
 cat ~/.weatherreport && read
diff --git a/.scripts/remaps b/.scripts/remaps
index 39f82b7..95acd90 100755
--- a/.scripts/remaps
+++ b/.scripts/remaps
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 # This script is called by i3 on startup.