fix some shellcheck warnings

Author: anlutro

configs/shell/bashrc

@@ -107,7 +107,7 @@ _set_ps1() {
 			VIRTUAL_ENV_NAME=$(basename "$VIRTUAL_ENV")
 		fi
 		if [ "$VIRTUAL_ENV_NAME" = '.venv' ]; then
-			VIRTUAL_ENV_NAME=$(basename $(basename "$VIRTUAL_ENV"))
+			VIRTUAL_ENV_NAME=$(basename "$(basename "$VIRTUAL_ENV")")
 		fi
 		PS1+="  \[\033[0;34m\]$VIRTUAL_ENV_NAME\[\033[00m\]"
 	fi

configs/x11/xautolock

@@ -3,7 +3,7 @@
 if command -v killall >/dev/null 2>&1; then
 	killall xautolock
 elif pidof xautolock >/dev/null; then
-	kill $(pidof xautolock)
+	kill "$(pidof xautolock)"
 fi
 
 if acpi -b 2> /dev/null | grep -q Battery; then

configs/x11/xinitrc

@@ -8,7 +8,7 @@ exec >> "$HOME/.xlog" 2>&1
 # unlike other uses of xhost, this is safe since the kernel can check
 # the actual owner of the calling process.
 if command -v xhost >/dev/null 2>&1; then
-	xhost +si:localuser:$(id -un) || :
+	xhost "+si:localuser:$(id -un)" || :
 fi
 
 # if no argument was passed, try and guess what command to start x with
@@ -24,7 +24,7 @@ if [ -z "$*" ]; then
 		exit 1
 	fi
 else
-	X_START_CMD="$@"
+	X_START_CMD="$*"
 fi
 
 # use dbus-launch to spawn the session if available. this enables X applications
@@ -41,7 +41,7 @@ fi
 # TODO: find alternative solutions
 if command -v 'ssh-agent' >/dev/null 2>&1; then
 	killall ssh-agent --user $USER
-	eval $(ssh-agent -s)
+	eval "$(ssh-agent -s)"
 fi
 
 # configure external monitors

scripts/notes.sh

@@ -42,7 +42,7 @@ main() {
 		shift
 	done
 
-	eval note_$func $@
+	eval "note_$func" "$@"
 }
 
 note_new() {

scripts/stream-twitch.sh

@@ -32,7 +32,7 @@ VIDEO_BITRATE_MAX="3600k"
 # twitch server in frankfurt, see http://bashtech.net/twitch/ingest.php for list
 SERVER="live-ams"
 
-ffmpeg -f x11grab -s $CAPTURE_RESOLUTION -r $FPS -i :0.0 -ar $AUDIO_RATE
+ffmpeg -f x11grab -s $CAPTURE_RESOLUTION -r $FPS -i :0.0 -ar $AUDIO_RATE \
 	-f alsa -i hw:1,0 -f flv -ac 2 -vcodec libx264 -g $GOP -keyint_min $FPS \
 	-b:v $VIDEO_BITRATE_MAX -minrate $VIDEO_BITRATE_MIN -maxrate $VIDEO_BITRATE_MAX \
 	-pix_fmt yuv420p -s $OUTPUT_RESOLUTION -preset $PRESET -tune film \

shellcheck.sh

@@ -0,0 +1,10 @@
+#!/bin/sh
+
+: ${SEVERITY:=warning}
+
+# we want to find scripts with a shell-like shebang
+# AND files with the .sh extension
+{
+    find ./configs ./scripts -type f -exec awk 'FNR == 1 && /^#!.*sh/{print FILENAME}' {} +
+    find ./configs ./scripts -type f -name '*.sh'
+} | sort | uniq | xargs -r shellcheck --shell=bash --severity "$SEVERITY"