vis

commit 1552cb6d90f9100291049857a27e46f127bb28c8
parent cab8f0453a62045b63f8db7ebbbf3e0d42b08ba2
Author: Matěj Cepl <mcepl@cepl.eu>
Date:   Sun, 17 Jul 2022 19:24:54 +0200

vis-clipboard: clean up bashisms and make shellcheck happy.

Diffstat:
M
vis-clipboard
 | 
18
++++++++++--------

1 file changed, 10 insertions(+), 8 deletions(-)
diff --git a/vis-clipboard b/vis-clipboard
@@ -8,13 +8,13 @@ vc_fatal() {
 }
 
 vc_usage() {
-	vc_fatal "`basename $0` [--selection sel] [--usable|--copy|--paste]"
+	vc_fatal "$(basename "$0") [--selection sel] [--usable|--copy|--paste]"
 }
 
 vc_determine_command() {
 	if [ -n "$WAYLAND_DISPLAY" ]; then
 		for c in wl-copy wl-paste; do
-			if type "$c" >/dev/null 2>&1; then
+			if command -v "$c" >/dev/null 2>&1; then
 				echo "wlclipboard"
 				return 0
 			fi
@@ -23,7 +23,7 @@ vc_determine_command() {
 	
 	if [ -n "$DISPLAY" ]; then
 		for c in xclip xsel; do
-			if type "$c" >/dev/null 2>&1; then
+			if command -v "$c" >/dev/null 2>&1; then
 				echo "$c"
 				return 0
 			fi
@@ -34,7 +34,7 @@ vc_determine_command() {
 		vc_fatal "clipboard primary selection is not supported on your platform"
 	fi
 
-	if type pbcopy >/dev/null 2>&1; then
+	if command -v pbcopy >/dev/null 2>&1; then
 		echo 'mac'
 		return 0
 	fi
@@ -56,25 +56,27 @@ vc_usable() {
 }
 
 vc_copy() {
-	COPY_CMD="`vc_determine_command 2>/dev/null`"
+	COPY_CMD="$(vc_determine_command 2>/dev/null)"
 
+	# shellcheck disable=SC2181
 	if [ $? -ne 0 ] || [ -z "$COPY_CMD" ]; then
 		vc_fatal 'System clipboard not supported'
 	fi
 
-	vc_${COPY_CMD}_copy
+	"vc_${COPY_CMD}_copy"
 
 	exit $?
 }
 
 vc_paste() {
-	PASTE_CMD="`vc_determine_command 2>/dev/null`"
+	PASTE_CMD="$(vc_determine_command 2>/dev/null)"
 
+	# shellcheck disable=SC2181
 	if [ $? -ne 0 ] || [ -z "$PASTE_CMD" ]; then
 		vc_fatal 'System clipboard not supported'
 	fi
 
-	vc_${PASTE_CMD}_paste
+	"vc_${PASTE_CMD}_paste"
 
 	exit $?
 }