Some work on Scripts

notable changes:
- rename `bt-connect` to `bt_connect`
- rename `music` to `media` and make it generic instead of checking
  Spotify
- make separate script to set background to a preset black image
- make all shebangs "#!/usr/bin/env sh"

18 files changed, 40 insertions, 69 deletions

diff --git a/Scripts/.local/scripts/background b/Scripts/.local/scripts/background
index 139e5fb..1c80996 100755
--- a/Scripts/.local/scripts/background
+++ b/Scripts/.local/scripts/background
@@ -1,4 +1,3 @@
-#!/bin/bash
+#!/usr/bin/env sh
 
 feh --bg-fill --randomize $HOME/Pictures/Backgrounds;
-# feh --bg-fill $HOME/Pictures/Backgrounds/black.jpg;
diff --git a/Scripts/.local/scripts/black-bg b/Scripts/.local/scripts/black-bg
new file mode 100755
index 0000000..5fae766
--- /dev/null
+++ b/Scripts/.local/scripts/black-bg
@@ -0,0 +1,3 @@
+#!/usr/bin/env sh
+
+feh --bg-fill $HOME/Pictures/Backgrounds/black-nice.jpg;
diff --git a/Scripts/.local/scripts/bt-connect b/Scripts/.local/scripts/bt_connect
index 1e23053..1e23053 100755
--- a/Scripts/.local/scripts/bt-connect
+++ b/Scripts/.local/scripts/bt_connect
diff --git a/Scripts/.local/scripts/emoticons b/Scripts/.local/scripts/emoticons
index 12d7978..228052e 100755
--- a/Scripts/.local/scripts/emoticons
+++ b/Scripts/.local/scripts/emoticons
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env sh
 
 response=$(cat $HOME/.local/share/emoticons.txt | dmenu -F -i)
 emoticon=$(echo $response | sed 's/\w+//gi' | awk '{print $1}')
diff --git a/Scripts/.local/scripts/gamepad_daemon b/Scripts/.local/scripts/gamepad_daemon
index 492e65a..c9adc3e 100755
--- a/Scripts/.local/scripts/gamepad_daemon
+++ b/Scripts/.local/scripts/gamepad_daemon
@@ -1,7 +1,7 @@
-#!/bin/sh
-P=$HOME
+#!/usr/bin/env sh
+
 sudo xboxdrv --silent \
-     -c $P/.config/xboxdrv/general.xboxdrv \
-     --alt-config $P/.config/xboxdrv/typing.xboxdrv \
-     --alt-config $P/.config/xboxdrv/media.xboxdrv \
+     -c $HOME/.config/xboxdrv/general.xboxdrv \
+     --alt-config $HOME/.config/xboxdrv/typing.xboxdrv \
+     --alt-config $HOME/.config/xboxdrv/media.xboxdrv \
      --axis-sensitivity X1=-1.0,X2=-1.0,Y1=-1.0,Y2=-1.0
diff --git a/Scripts/.local/scripts/kxinit b/Scripts/.local/scripts/kxinit
index 2540641..a5e329b 100755
--- a/Scripts/.local/scripts/kxinit
+++ b/Scripts/.local/scripts/kxinit
@@ -1,3 +1,3 @@
-#!/bin/bash
+#!/usr/bin/env sh
 
 killall xinit;
diff --git a/Scripts/.local/scripts/localstream b/Scripts/.local/scripts/localstream
index aa6b46f..1250763 100755
--- a/Scripts/.local/scripts/localstream
+++ b/Scripts/.local/scripts/localstream
@@ -27,7 +27,7 @@ choice=$(ssh oreo@oldboy "find /media/hdd/content/ -type 'f' $filtering" |\
              sed "s/\/media\/hdd\/content\/$selection/\1/g" |\
              dmenu -i -l 5 -p "Choose file: ")
 
-if [ $1 == "-f" ]
+if [ $1 = "-f" ]
 then
     mpv "sftp://oldboy:/media/hdd/content/$choice$ending"
 else
diff --git a/Scripts/.local/scripts/playlist_choice b/Scripts/.local/scripts/playlist_choice
index af69765..0a0d809 100755
--- a/Scripts/.local/scripts/playlist_choice
+++ b/Scripts/.local/scripts/playlist_choice
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env sh
 choice=$(mpc playlist | dmenu -i)
 if [[ -n "$choice" ]]
 then
@@ -7,4 +7,3 @@ then
 else
     echo "No choice given"
 fi
-
diff --git a/Scripts/.local/scripts/speed b/Scripts/.local/scripts/speed
index b5f7150..70145d5 100755
--- a/Scripts/.local/scripts/speed
+++ b/Scripts/.local/scripts/speed
@@ -1,2 +1,2 @@
-#!/bin/bash
+#!/usr/bin/env sh
 wget -nv --show-progress -O /dev/null "https://aryadevchavali.com/resources/Table-of-Integrals.pdf"
diff --git a/Scripts/.local/scripts/st-scripts/link-grab.sh b/Scripts/.local/scripts/st-scripts/link-grab.sh
index e8eee52..127990d 100755
--- a/Scripts/.local/scripts/st-scripts/link-grab.sh
+++ b/Scripts/.local/scripts/st-scripts/link-grab.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env sh
 # From https://github.com/LukeSmithxyz/st
 
 urlregex="(((http|https|gopher|gemini|ftp|ftps|git)://|www\\.)[a-zA-Z0-9.]*[:;a-zA-Z0-9./+@$&%?$\#=_~-]*)|((magnet:\\?xt=urn:btih:)[a-zA-Z0-9]*)"
diff --git a/Scripts/.local/scripts/st-scripts/output-copy.sh b/Scripts/.local/scripts/st-scripts/output-copy.sh
index 6ce52ee..2de03af 100755
--- a/Scripts/.local/scripts/st-scripts/output-copy.sh
+++ b/Scripts/.local/scripts/st-scripts/output-copy.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env sh
 # From https://github.com/LukeSmithxyz/st
 
 # By Jaywalker and Luke
diff --git a/Scripts/.local/scripts/statdisplay b/Scripts/.local/scripts/statdisplay
index a0505c1..41682e7 100755
--- a/Scripts/.local/scripts/statdisplay
+++ b/Scripts/.local/scripts/statdisplay
@@ -1,37 +1,21 @@
 #!/usr/bin/env sh
 
 script=""
-case "$(printf "Date\nBattery\nBrightness\nBluetooth\nMusic\nNetwork\nVolume\nTemperature\nMemory\nUptime" | dmenu -i -p "Select: ")" in
-    "Date")
-        script="datetime"
-        ;;
-    "Battery")
-        script="battery"
-        ;;
-    "Brightness")
-        script="brightness"
-        ;;
-    "Bluetooth")
-        script="bluetooth-status"
-        ;;
-    "Music")
-        script="music"
-        ;;
-    "Network")
-        script="connection"
-        ;;
-    "Volume")
-        script="volume"
-        ;;
-    "Temperature")
-        script="temperature"
-        ;;
-    "Memory")
-        script="memory"
-        ;;
-    "Uptime")
-        script="uptime_status"
-        ;;
+choices="Date\nBattery\nBrightness\nBluetooth\nMedia\nNetwork\nVolume\nTemperature\nMemory\nUptime"
+choice=$(printf $choices | dmenu -i -p "Select: ")
+
+case $choice in
+    "Date")        script="datetime" ;;
+    "Battery")     script="battery" ;;
+    "Brightness")  script="brightness" ;;
+    "Bluetooth")   script="bluetooth-status" ;;
+    "Media")       script="media" ;;
+    "Network")     script="connection" ;;
+    "Volume")      script="volume" ;;
+    "Temperature") script="temperature" ;;
+    "Memory")      script="memory" ;;
+    "Uptime")      script="uptime_status" ;;
+    *) exit 1 ;;
 esac
 
 notify-send -u low "$(~/.local/scripts/status/$script)"
diff --git a/Scripts/.local/scripts/status/bluetooth-status b/Scripts/.local/scripts/status/bluetooth-status
index 6de5422..35c550a 100755
--- a/Scripts/.local/scripts/status/bluetooth-status
+++ b/Scripts/.local/scripts/status/bluetooth-status
@@ -1,7 +1,7 @@
 #!/usr/bin/env sh
 
-name=$(bluetoothctl info | grep "Name" | sed 's/.*Name: //')
-battery=$(bluetoothctl info | grep "Battery" | sed 's/.*(//;s/)//')
+name=$(bluetoothctl info | grep "Alias" | sed 's/.*Alias: //')
+battery=$(bluetoothctl info | grep "Battery Percentage" | sed 's/.*(//;s/)//')
 if [ ! "$name" ]
 then
     echo ""
diff --git a/Scripts/.local/scripts/status/media b/Scripts/.local/scripts/status/media
new file mode 100755
index 0000000..5bc4997
--- /dev/null
+++ b/Scripts/.local/scripts/status/media
@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+
+title=$(playerctl metadata title)
+echo " $title"
diff --git a/Scripts/.local/scripts/status/memory b/Scripts/.local/scripts/status/memory
index e9e6f8d..2648deb 100755
--- a/Scripts/.local/scripts/status/memory
+++ b/Scripts/.local/scripts/status/memory
@@ -1,8 +1,8 @@
-#!/bin/bash
+#!/usr/bin/env sh
 
 line=$(free -m | sed -n 2p);
 used=$(echo $line | awk '{print $3}');
 available=$(echo $line | awk '{print $2}');
 value=$(echo "100 * $used / $available" | bc -l | xargs printf "%.2f" $1)
 
-echo "⾝ $(printf "%dMB" $used) $value%"
+echo "㊎ $(printf "%dMB" $used) $value%"
diff --git a/Scripts/.local/scripts/status/music b/Scripts/.local/scripts/status/music
deleted file mode 100755
index 6d09868..0000000
--- a/Scripts/.local/scripts/status/music
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/env bash
-
-title=$(playerctl --player=spotify metadata title | cut -c 1-30)
-echo " $title"
diff --git a/Scripts/.local/scripts/status/music_update_bar b/Scripts/.local/scripts/status/music_update_bar
deleted file mode 100755
index b0d68b1..0000000
--- a/Scripts/.local/scripts/status/music_update_bar
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/bash
-
-while :
-do
-  prev="$(playerctl --player=spotify metadata title)"
-  item=$prev
-  while [[ $item == $prev ]]
-  do
-    item="$(playerctl --player=spotify metadata title)";
-    sleep 0.5;
-  done
-  kill -37 $(pidof dwmblocks);
-  item="";
-done
diff --git a/Scripts/.local/scripts/suctl b/Scripts/.local/scripts/suctl
index feb2a0f..d4da0b6 100755
--- a/Scripts/.local/scripts/suctl
+++ b/Scripts/.local/scripts/suctl
@@ -1,3 +1,3 @@
-#!/bin/bash
+#!/usr/bin/env sh
 
 systemctl --user $@