Misc fixes all over the place, mostly untested though.

checksum_file.sh | 32 +++++++++++------------ convert-music.sh | 60 +++++++++++++++++++++---------------------- find_dups.sh | 4 +-- funiq.sh | 2 +- ipsec_iproute.sh | 70 +++++++++++++++++++++++++-------------------------- keyboard-backlight.sh | 30 +++++++++++----------- port-mgmt.sh | 10 ++++---- qemu-tap.sh | 40 ++++++++++++++--------------- sensors_adt746x.sh | 20 +++++++-------- vbox-sysrq.sh | 6 ++--- 10 files changed, 137 insertions(+), 137 deletions(-) Signed-off-by: Christian Kujau <[email protected]>
ckujau · Oct 21, 2022 · fb6ea1c · fb6ea1c
1 parent d703a24
commit fb6ea1c
Show file tree

Hide file tree

Showing 10 changed files with 137 additions and 137 deletions.
diff --git a/checksum_file.sh b/checksum_file.sh
@@ -208,7 +208,7 @@ esac
 case ${ACTION} in
 ####### GET
 	get)
-	CHECKSUM_S=$(_get "$FILE")
+	CHECKSUM_S=$(_get "${FILE}")
 
 	# Did we find a checksum?
 	if [ -n "${CHECKSUM_S}" ]; then
@@ -221,42 +221,42 @@ case ${ACTION} in
 
 ####### SET
 	set)
-	_set "$FILE" || \
+	_set "${FILE}" || \
 		do_log "ERROR: failed to set user.checksum.${DIGEST} for file ${FILE}!" 1
 	;;
 
 ####### GET-SET)
 	get-set)
-	CHECKSUM_S=$(_get "$FILE")
+	CHECKSUM_S=$(_get "${FILE}")
 
 	# Did we find a checksum?
 	if [ -n "${CHECKSUM_S}" ]; then
 		# Print out checksum
 		echo "user.checksum.${DIGEST}: ${CHECKSUM_S}"
 	else
 		# Set checksum
-		_set "$FILE"
+		_set "${FILE}"
 	fi
 	;;
 
 ####### CHECK-SET
 	check-set)
-	CHECKSUM_S=$(_get "$FILE")
+	CHECKSUM_S=$(_get "${FILE}")
 
 	# Did we find a checksum?
 	if [ -n "${CHECKSUM_S}" ]; then
 		# Verify checksum
-		$0 check "$FILE"				# Calling ourselves!
+		$0 check "${FILE}"				# Calling ourselves!
 	else
 		# Set checksum
-		_set "$FILE"
+		_set "${FILE}"
 	fi
 	;;
 
 ####### CHECK
 	check)
-	CHECKSUM_C=$(_calc "$FILE")
-	CHECKSUM_S=$(_get  "$FILE")
+	CHECKSUM_C=$(_calc "${FILE}")
+	CHECKSUM_S=$(_get  "${FILE}")
 
 	# Bail out if there is no checksum to compare
 	[ -z  "${CHECKSUM_C}" ] || [ -z "${CHECKSUM_S}" ] && \
@@ -277,23 +277,23 @@ case ${ACTION} in
 	echo "Removing user.checksum.${DIGEST} from ${FILE}..."
 	case ${OS} in
 		Darwin)
-		xattr -d user.checksum.${DIGEST} "$FILE"
+		xattr -d user.checksum.${DIGEST} "${FILE}"
 		;;
 
 		FreeBSD)
-		pxattr -x user.checksum.${DIGEST} "$FILE"
+		pxattr -x user.checksum.${DIGEST} "${FILE}"
 		;;
 
 		NetBSD)
-		rmextattr user checksum.${DIGEST} "$FILE"
+		rmextattr user checksum.${DIGEST} "${FILE}"
 		;;
 
 		Linux)
-		setfattr --remove user.checksum.${DIGEST} -- "$FILE"
+		setfattr --remove user.checksum.${DIGEST} -- "${FILE}"
 		;;
 
 		SunOS)
-		runat "$FILE" rm user.checksum.${DIGEST}
+		runat "${FILE}" rm user.checksum.${DIGEST}
 		;;
 
 		*)
@@ -306,9 +306,9 @@ case ${ACTION} in
 	test)
 	# We need a temporary file, even on macOS
 	TEMP=$(mktemp -p . 2>/dev/null || mktemp ./tmp.XXXXXXX 2>/dev/null)
-	trap "rm -f $TEMP" EXIT INT TERM HUP
+	trap "rm -f ${TEMP}" EXIT INT TERM HUP
 
-	if [ ! -f "$TEMP" ]; then
+	if [ ! -f "${TEMP}" ]; then
 		do_log "Failed to create temporary file ${TEMP}!" 1
 	else
 		date > "${TEMP}"

diff --git a/convert-music.sh b/convert-music.sh
@@ -19,7 +19,7 @@ if [ ! $# -eq 2 ] || [ ! -f "$2" ]; then
 else
 	CONVERSION="$1"
 	FILE="$2"
-	PATH=$PATH:/opt/lame/bin
+	PATH=${PATH}:/opt/lame/bin
 fi
 
 # LAME defaults
@@ -33,18 +33,18 @@ fi
 # --pad-id3v2		- ?
 LAMEARGS="-m j -q 5 --vbr-new -V 4 -s 44.1 --add-id3v2 --ignore-tag-errors"
 
-case $CONVERSION in
+case ${CONVERSION} in
 	flac2mp3)
 	# Convert FLAC to MP3
 	# https://wiki.archlinux.org/index.php/Convert_FLAC_to_MP3
 	# Software needed: flac, lame
 	OUTPUT=${FILE%.flac}.mp3
-	 TRACK=$(metaflac --show-tag=TRACKNUMBER "$FILE" | sed s/.*=//)
-	 TITLE=$(metaflac --show-tag=TITLE  "$FILE" | sed s/.*=//)
-	ARTIST=$(metaflac --show-tag=ARTIST "$FILE" | sed s/.*=//)
-	 ALBUM=$(metaflac --show-tag=ALBUM  "$FILE" | sed s/.*=//)
-	  DATE=$(metaflac --show-tag=DATE   "$FILE" | sed s/.*=//)
-	 GENRE=$(metaflac --show-tag=GENRE  "$FILE" | sed s/.*=//)
+	 TRACK=$(metaflac --show-tag=TRACKNUMBER "${FILE}" | sed s/.*=//)
+	 TITLE=$(metaflac --show-tag=TITLE  "${FILE}" | sed s/.*=//)
+	ARTIST=$(metaflac --show-tag=ARTIST "${FILE}" | sed s/.*=//)
+	 ALBUM=$(metaflac --show-tag=ALBUM  "${FILE}" | sed s/.*=//)
+	  DATE=$(metaflac --show-tag=DATE   "${FILE}" | sed s/.*=//)
+	 GENRE=$(metaflac --show-tag=GENRE  "${FILE}" | sed s/.*=//)
 	#
 	# lame options:
 	# -m j		joint stereo
@@ -54,46 +54,46 @@ case $CONVERSION in
 	# -s 44.1	sampling frequency
 	#
 	# Note: if GENRE is empty, use "12" (other). If TRACKNUMBER is empty, use "0".
-	flac --stdout --decode "$FILE" | \
+	flac --stdout --decode "${FILE}" | \
 	lame -m j -q 0 --vbr-new -V 0 -s 44.1 --add-id3v2 --pad-id3v2 \
-		--ignore-tag-errors --tn "${TRACK:-0}" --tt "$TITLE" \
-		--ta "$ARTIST" --tl "$ALBUM" --ty "$DATE" --tg "${GENRE:-12}" - "$OUTPUT"
+		--ignore-tag-errors --tn "${TRACK:-0}" --tt "${TITLE}" \
+		--ta "${ARTIST}" --tl "${ALBUM}" --ty "${DATE}" --tg "${GENRE:-12}" - "${OUTPUT}"
 	;;
 
 	m4a2mp3)
 	# Software needed: faad, lame
 	OUTPUT=${FILE%.m4a}.mp3
-	 TRACK=$(faad --info "$FILE" 2>&1 | grep ^track  | sed 's/^.*: //')
-	 TITLE=$(faad --info "$FILE" 2>&1 | grep ^title  | sed 's/^.*: //')
-	ARTIST=$(faad --info "$FILE" 2>&1 | grep ^artist | sed 's/^.*: //')
-	 ALBUM=$(faad --info "$FILE" 2>&1 | grep ^album  | sed 's/^.*: //')
-	  DATE=$(faad --info "$FILE" 2>&1 | grep ^date   | sed 's/^.*: //')
-	 GENRE=$(faad --info "$FILE" 2>&1 | grep ^genre  | sed 's/^.*: //')
+	 TRACK=$(faad --info "${FILE}" 2>&1 | grep ^track  | sed 's/^.*: //')
+	 TITLE=$(faad --info "${FILE}" 2>&1 | grep ^title  | sed 's/^.*: //')
+	ARTIST=$(faad --info "${FILE}" 2>&1 | grep ^artist | sed 's/^.*: //')
+	 ALBUM=$(faad --info "${FILE}" 2>&1 | grep ^album  | sed 's/^.*: //')
+	  DATE=$(faad --info "${FILE}" 2>&1 | grep ^date   | sed 's/^.*: //')
+	 GENRE=$(faad --info "${FILE}" 2>&1 | grep ^genre  | sed 's/^.*: //')
 
-	faad --stdio "$FILE" | lame "$LAMEARGS" --tn "${TRACK:-0}" --tt "$TITLE" \
-		--ta "$ARTIST" --tl "$ALBUM" --ty "$DATE" --tg "${GENRE:-12}" - "$OUTPUT"
+	faad --stdio "${FILE}" | lame "${LAMEARGS}" --tn "${TRACK:-0}" --tt "${TITLE}" \
+		--ta "${ARTIST}" --tl "${ALBUM}" --ty "${DATE}" --tg "${GENRE:-12}" - "${OUTPUT}"
 	;;
 
 	ogg2mp3)
 	OUTPUT=${FILE%.ogg}.mp3
-	eval $(ogginfo -qv "$FILE" | awk '/ARTIST/ || /TITLE/' | sed 's/^     //')
-#	echo "ARTIST: $ARTIST TITLE: $TITLE"
-	if [ -z "$ARTIST" ] || [ -z "$TITLE" ]; then
-		echo "WARNING: Not enough metadata, trying to gather track information from filename! ($FILE)"
-		 TRACK=$(ls "$FILE" | awk -F\  '{print $1}')
-		 TITLE=$(ls "$FILE" | sed 's/^[0-9]* - //;s/\.ogg//')
+	eval $(ogginfo -qv "${FILE}" | awk '/ARTIST/ || /TITLE/' | sed 's/^     //')
+#	echo "ARTIST: ${ARTIST} TITLE: ${TITLE}"
+	if [ -z "${ARTIST}" ] || [ -z "${TITLE}" ]; then
+		echo "WARNING: Not enough metadata, trying to gather track information from filename! (${FILE})"
+		 TRACK=$(ls "${FILE}" | awk -F\  '{print $1}')
+		 TITLE=$(ls "${FILE}" | sed 's/^[0-9]* - //;s/\.ogg//')
 
 		# Try to find the ARLBUM via the directory name
-		cd "$(dirname "$FILE")" || exit
+		cd "$(dirname "${FILE}")" || exit
 		ALBUM="$(basename $(pwd))"
-		echo "TRACK: $TRACK TITLE: $TITLE ALBUM: $ALBUM"
+		echo "TRACK: $TRACK TITLE: ${TITLE} ALBUM: ${ALBUM}"
 	fi
-	oggdec --quiet "$FILE" --output - | lame "$LAMEARGS" --tn "${TRACK:-0}" --tt "$TITLE" \
-		--tl "$ALBUM" - "$OUTPUT"
+	oggdec --quiet "${FILE}" --output - | lame "${LAMEARGS}" --tn "${TRACK:-0}" --tt "${TITLE}" \
+		--tl "${ALBUM}" - "${OUTPUT}"
 	;;
 
 	*)
-	echo "$(basename "$0"): conversion $CONVERSION unknow."
+	echo "$(basename "$0"): conversion ${CONVERSION} unknown"
 	exit 1
 	;;
 esac
diff --git a/find_dups.sh b/find_dups.sh
@@ -83,7 +83,7 @@ case $MODE in
 	echo
 	echo "           All files: $(cat "$TEMP"             | wc -l)"
 	echo "Files with same size: $(cat "$TEMP".fallout     | wc -l)"
-	echo "     Duplicate files: $(expr $(egrep -c '^[[:alnum:]]' "$TEMP".fallout.dup) / 2)"
+	echo "     Duplicate files: $(expr $(grep -Ec '^[[:alnum:]]' "$TEMP".fallout.dup) / 2)"
 	echo "    Time to complete: $(expr "$END" - "$BEGIN") seconds"
 	echo
 	;;
@@ -98,7 +98,7 @@ case $MODE in
 	END=$(date +%s)
 	echo
 	echo "           All files: $(cat "$TEMP"             | wc -l)"
-	echo "     Duplicate files: $(expr $(egrep -c '^[[:alnum:]]' "$TEMP".dup) / 2)"
+	echo "     Duplicate files: $(expr $(grep -Ec '^[[:alnum:]]' "$TEMP".dup) / 2)"
 	echo "    Time to complete: $(expr "$END" - "$BEGIN") seconds"
 	;;
 

diff --git a/funiq.sh b/funiq.sh
@@ -57,4 +57,4 @@ awk 'BEGIN {CURRPAIRS=0;PAIRMATCHES=0;PREVPAIRS=0}
 	for (SUB in CURR) PREV[SUB]=CURR[SUB]
 	for (SUB in CURR) delete CURR[SUB]
 	PREVPAIRS=CURRPAIRS
-}' REQSIM=$SIM $@
+}' REQSIM=${SIM} $@
diff --git a/ipsec_iproute.sh b/ipsec_iproute.sh
@@ -10,7 +10,7 @@
 # > “On the fly” IPsec VPN with iproute2
 # > https://backreference.org/2014/11/12/on-the-fly-ipsec-vpn-with-iproute2/
 #
-if [ $# -ne 7 ] || [ ! -f "$HOME/.xfrm-keys" ]; then
+if [ $# -ne 7 ] || [ ! -f "${HOME}/.xfrm-keys" ]; then
 	echo "Usage: $(basename "$0") [SRC LOCAL DEV] [DST REMOTE DEV] [start|stop|status]"
 	echo " Note: We also need a key file in \$HOME/.xfrm-keys, with NN bit keys and"
 	echo "       a 32 bit id, generated like this:"
@@ -32,69 +32,69 @@ else
 fi
 
 # Read keys
-eval $(grep -v ^\# "$HOME"/.xfrm-keys)
-if [ -z "$CIPHER" ] || [ -z "$KEY1" ] || [ -z "$KEY2" ] || [ -z "$ID" ]; then
-	echo "Could not read cipher/keys from $HOME/.xfrm-keys!"
+eval $(grep -Ev '^\#' "${HOME}/.xfrm-keys")
+if [ -z "${CIPHER}" ] || [ -z "${KEY1}" ] || [ -z "${KEY2}" ] || [ -z "${ID}" ]; then
+	echo "Could not read cipher/keys from ${HOME}/.xfrm-keys!"
 	exit 1
 fi
 
 # unset me!
 # DEBUG=echo
-# echo "DEBUG: SRC: $SRC LOCAL: $LOCAL DEVL: $DEVL / DST: $DST REMOTE: $REMOTE DEVR: $DEVR"
+# echo "DEBUG: SRC: ${SRC} LOCAL: ${LOCAL} DEVL: ${DEVL} / DST: ${DST} REMOTE: ${REMOTE} DEVR: ${DEVR}"
 
-case $ACTION in
+case ${ACTION} in
 	start)
 	# XFRM
-	$DEBUG ip xfrm state  add src "$SRC"    dst "$DST"    proto esp spi "$ID" reqid "$ID" mode tunnel auth sha256 "$KEY1" enc "$CIPHER" "$KEY2"
-	$DEBUG ip xfrm state  add src "$DST"    dst "$SRC"    proto esp spi "$ID" reqid "$ID" mode tunnel auth sha256 "$KEY1" enc "$CIPHER" "$KEY2"
-	$DEBUG ip xfrm policy add src "$LOCAL"  dst "$REMOTE" dir out tmpl src "$SRC" dst "$DST" proto esp reqid "$ID" mode tunnel
-	$DEBUG ip xfrm policy add src "$REMOTE" dst "$LOCAL"  dir in  tmpl src "$DST" dst "$SRC" proto esp reqid "$ID" mode tunnel
+	${DEBUG} ip xfrm state  add src "${SRC}"    dst "${DST}"    proto esp spi "${ID}" reqid "${ID}" mode tunnel auth sha256 "$KEY1" enc "$CIPHER" "$KEY2"
+	${DEBUG} ip xfrm state  add src "${DST}"    dst "${SRC}"    proto esp spi "${ID}" reqid "${ID}" mode tunnel auth sha256 "$KEY1" enc "$CIPHER" "$KEY2"
+	${DEBUG} ip xfrm policy add src "${LOCAL}"  dst "${REMOTE}" dir out tmpl src "${SRC}" dst "${DST}" proto esp reqid "${ID}" mode tunnel
+	${DEBUG} ip xfrm policy add src "${REMOTE}" dst "${LOCAL}"  dir in  tmpl src "${DST}" dst "${SRC}" proto esp reqid "${ID}" mode tunnel
 
 	# Routing
-	$DEBUG ip addr  add "$LOCAL"/32  dev lo
-	$DEBUG ip route add "$REMOTE"/32 dev "$DEVL" src "$LOCAL"
+	${DEBUG} ip addr  add "${LOCAL}/32"  dev lo
+	${DEBUG} ip route add "${REMOTE}/32" dev "${DEVL}" src "${LOCAL}"
 
 	# And again on the remote side
-	ssh "$DST" /bin/sh -x << EOF
+	ssh "${DST}" /bin/sh -x << EOF
 	    # XFRM
-	    $DEBUG ip xfrm state  add src $SRC    dst $DST    proto esp spi $ID reqid $ID mode tunnel auth sha256 $KEY1 enc "$CIPHER" $KEY2
-	    $DEBUG ip xfrm state  add src $DST    dst $SRC    proto esp spi $ID reqid $ID mode tunnel auth sha256 $KEY1 enc "$CIPHER" $KEY2
-	    $DEBUG ip xfrm policy add src $REMOTE dst $LOCAL  dir   out tmpl src $DST dst $SRC proto esp reqid $ID mode tunnel
-	    $DEBUG ip xfrm policy add src $LOCAL  dst $REMOTE dir   in  tmpl src $SRC dst $DST proto esp reqid $ID mode tunnel
+	    ${DEBUG} ip xfrm state  add src ${SRC}    dst ${DST}    proto esp spi ${ID} reqid ${ID} mode tunnel auth sha256 $KEY1 enc "$CIPHER" $KEY2
+	    ${DEBUG} ip xfrm state  add src ${DST}    dst ${SRC}    proto esp spi ${ID} reqid ${ID} mode tunnel auth sha256 $KEY1 enc "$CIPHER" $KEY2
+	    ${DEBUG} ip xfrm policy add src ${REMOTE} dst ${LOCAL}  dir   out tmpl src ${DST} dst ${SRC} proto esp reqid ${ID} mode tunnel
+	    ${DEBUG} ip xfrm policy add src ${LOCAL}  dst ${REMOTE} dir   in  tmpl src ${SRC} dst ${DST} proto esp reqid ${ID} mode tunnel
 	    # Routing
-	    $DEBUG ip addr  add $REMOTE/32 dev lo
-	    $DEBUG ip route add $LOCAL/32  dev $DEVR src $REMOTE
+	    ${DEBUG} ip addr  add ${REMOTE}/32 dev lo
+	    ${DEBUG} ip route add ${LOCAL}/32  dev ${DEVR} src ${REMOTE}
 EOF
 	;;
 
 	stop)
 	# Remote
-	ssh "$DST" /bin/sh -x << EOF
+	ssh "${DST}" /bin/sh -x << EOF
 	    # Routing
-	    $DEBUG ip route del $LOCAL/32  dev $DEVR src $REMOTE
-	    $DEBUG ip addr  del $REMOTE/32 dev lo
+	    ${DEBUG} ip route del ${LOCAL}/32  dev ${DEVR} src ${REMOTE}
+	    ${DEBUG} ip addr  del ${REMOTE}/32 dev lo
 	    # XFRM
-	    $DEBUG ip xfrm policy del src $LOCAL  dst $REMOTE dir   in
-	    $DEBUG ip xfrm policy del src $REMOTE dst $LOCAL  dir   out
-	    $DEBUG ip xfrm state  del src $DST    dst $SRC    proto esp spi $ID
-	    $DEBUG ip xfrm state  del src $SRC    dst $DST    proto esp spi $ID
+	    ${DEBUG} ip xfrm policy del src ${LOCAL}  dst ${REMOTE} dir   in
+	    ${DEBUG} ip xfrm policy del src ${REMOTE} dst ${LOCAL}  dir   out
+	    ${DEBUG} ip xfrm state  del src ${DST}    dst ${SRC}    proto esp spi ${ID}
+	    ${DEBUG} ip xfrm state  del src ${SRC}    dst ${DST}    proto esp spi ${ID}
 EOF
 	# Routing
-	$DEBUG ip route del "$REMOTE"/32 dev "$DEVL" src "$LOCAL"
-	$DEBUG ip addr  del "$LOCAL"/32  dev lo
+	${DEBUG} ip route del "${REMOTE}"/32 dev "${DEVL}" src "${LOCAL}"
+	${DEBUG} ip addr  del "${LOCAL}"/32  dev lo
 
 	# XFRM
-	$DEBUG ip xfrm policy del src "$REMOTE" dst "$LOCAL"  dir in
-	$DEBUG ip xfrm policy del src "$LOCAL"  dst "$REMOTE" dir out
-	$DEBUG ip xfrm state  del src "$DST"    dst "$SRC"    proto esp spi "$ID"
-	$DEBUG ip xfrm state  del src "$SRC"    dst "$DST"    proto esp spi "$ID"
+	${DEBUG} ip xfrm policy del src "${REMOTE}" dst "${LOCAL}"  dir in
+	${DEBUG} ip xfrm policy del src "${LOCAL}"  dst "${REMOTE}" dir out
+	${DEBUG} ip xfrm state  del src "${DST}"    dst "${SRC}"    proto esp spi "${ID}"
+	${DEBUG} ip xfrm state  del src "${SRC}"    dst "${DST}"    proto esp spi "${ID}"
 	;;
 
 	status)
-	$DEBUG ip xfrm state && ip xfrm policy
+	${DEBUG} ip xfrm state && ip xfrm policy
 	echo
-	ssh "$DST" /bin/sh -x << EOF
-		$DEBUG ip xfrm state && ip xfrm policy
+	ssh "${DST}" /bin/sh -x << EOF
+		${DEBUG} ip xfrm state && ip xfrm policy
 EOF
 	;;
 esac