Fix all warnings reported by shellcheck

8 files changed, 43 insertions, 39 deletions

diff --git a/arch/arch.deps.sh b/arch/arch.deps.sh
index f7162ae..c2ddd28 100755
--- a/arch/arch.deps.sh
+++ b/arch/arch.deps.sh
@@ -9,9 +9,9 @@ quote () {
 }
 
 list_file="$1"
-: ${list_file:="arch.list"}
-: ${TAR:="tar"}
-: ${ARCH_DBPATH:="/var/lib/pacman"}
+: "${list_file:="arch.list"}"
+: "${TAR:="tar"}"
+: "${ARCH_DBPATH:="/var/lib/pacman"}"
 dbpath_sync="${ARCH_DBPATH}/sync"
 
 newline='
@@ -37,15 +37,15 @@ pkg_groups_find () {
 # Build the list of groups
 for db in "${dbpath_sync}"/*.db; do
 	msg "==> Loading package database ${db}"
-	tmpdir="`mktemp -d`"
-	if [ -z "${tmpdir}" ] || [ "`dirname "${tmpdir}"`" = "/" ]; then
+	tmpdir="$(mktemp -d)"
+	if [ -z "${tmpdir}" ] || [ "$(dirname "${tmpdir}")" = "/" ]; then
 		msg "==> Invalid temporary directory ${tmpdir}"
 		exit 1
 	fi
-	${TAR} -xf "${db}" -C "${tmpdir}"
+	"${TAR}" -xf "${db}" -C "${tmpdir}"
 	for desc in "${tmpdir}"/*/desc; do
 		have_groups=0
-		case "`cat "${desc}"`" in
+		case "$(cat "${desc}")" in
 			*%GROUPS%*)
 				have_groups=1
 				;;
@@ -91,13 +91,13 @@ for db in "${dbpath_sync}"/*.db; do
 			fi
 		done < "${desc}"
 	done
-	rm -rf "${tmpdir}"
+	rm -r -- "${tmpdir}"
 done
 
 loop_first=1
 msg "==> Expanding all groups"
-for pkg_or_group in `cat "${list_file}"`; do
-	pkgs="`pkg_groups_find "${pkg_or_group}"`"
+while read -r pkg_or_group; do
+	pkgs="$(pkg_groups_find "${pkg_or_group}")"
 	if [ -z "${pkgs}" ]; then
 		pkgs="${pkg_or_group}"
 	fi
@@ -109,4 +109,4 @@ for pkg_or_group in `cat "${list_file}"`; do
 		fi
 		loop_first=0
 	done
-done
+done < "${list_file}"
diff --git a/debian/debian.deps.sh b/debian/debian.deps.sh
index 4ad0088..c04fe29 100755
--- a/debian/debian.deps.sh
+++ b/debian/debian.deps.sh
@@ -1,14 +1,14 @@
 #!/bin/sh
 
 list_file="$1"
-: ${list_file:="debian.list"}
+: "${list_file:="debian.list"}"
 
 loop_first=1
-for pkg in `cat "${list_file}"`; do
+while read -r pkg; do
 	if [ "${loop_first}" = "1" ]; then
 		printf '%s' "${pkg}"
 	else
 		printf ', %s' "${pkg}"
 	fi
 	loop_first=0
-done
+done < "${list_file}"
diff --git a/freebsd/freebsd.deps.sh b/freebsd/freebsd.deps.sh
index d21dc1e..7bf634d 100755
--- a/freebsd/freebsd.deps.sh
+++ b/freebsd/freebsd.deps.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ports_file="$1"
-: ${ports_file:="freebsd.ports"}
+: "${ports_file:="freebsd.ports"}"
 
 exec 4< "${ports_file}"
 
diff --git a/freebsd/freebsd.install.sh b/freebsd/freebsd.install.sh
index 62d8b16..4dbd622 100755
--- a/freebsd/freebsd.install.sh
+++ b/freebsd/freebsd.install.sh
@@ -2,15 +2,15 @@
 
 msg_and_copy () {
     printf '==> Copying %s to %s\n' "$1" "$2" 1>&2
-    cp -r "$1" "$2"
+    cp -r -- "$1" "$2"
 }
 
 msg_and_mkdir () {
     printf '==> Creating directory %s\n' "$1" 1>&2
-    mkdir -p "$1"
+    mkdir -p -- "$1"
 }
 
-if [ -z "$4" ]; then
+if [ "$#" -lt "4" ]; then
     printf 'Usage: %s category cat_makefile cat_makefile_inc dir\n' "$0"
     printf 'Example: %s local local.makefile local.makefile.inc 217 will do\n' "$0"
     echo   ' mkdir -p                 /usr/ports/local'
@@ -20,17 +20,17 @@ if [ -z "$4" ]; then
     exit 1
 fi
 
-: ${PORTSDIR:="/usr/ports"}
+: "${PORTSDIR:="/usr/ports"}"
 category="$1"
 cat_makefile="$2"
 cat_makefile_inc="$3"
 dir="$4"
 
-[ '!' -d "${PORTSDIR}/${category}" ] && \
+[ ! -d "${PORTSDIR}/${category}" ] && \
     msg_and_mkdir "${PORTSDIR}/${category}"
-[ '!' -f "${PORTSDIR}/${category}/Makefile" ] && \
+[ ! -f "${PORTSDIR}/${category}/Makefile" ] && \
     msg_and_copy "${cat_makefile}" "${PORTSDIR}/${category}/Makefile"
-[ '!' -f "${PORTSDIR}/${category}/Makefile.inc" ] && \
+[ ! -f "${PORTSDIR}/${category}/Makefile.inc" ] && \
     msg_and_copy "${cat_makefile_inc}" "${PORTSDIR}/${category}/Makefile.inc"
 
 msg_and_copy "${dir}" "${PORTSDIR}/${category}"
diff --git a/freebsd/freebsd.nopkg-deps.sh b/freebsd/freebsd.nopkg-deps.sh
index ea70ee2..f6b51b6 100755
--- a/freebsd/freebsd.nopkg-deps.sh
+++ b/freebsd/freebsd.nopkg-deps.sh
@@ -1,14 +1,16 @@
 #!/bin/sh
 
 ports_file="$1"
-: ${ports_file:="freebsd.ports"}
+: "${ports_file:="freebsd.ports"}"
 
-tr '/' '_' < "${ports_file}" | paste "${ports_file}" - | (
-	while read -r pkg_name pkg_ports pkg_flavor unused pkg_ports_var unused; do
+# shellcheck disable=SC2094
+tr '/' '_' < "${ports_file}" | paste -- "${ports_file}" - | (
+	while read -r _ pkg_ports pkg_flavor _ pkg_ports_var _; do
 		if [ "${pkg_flavor}" != "@" ]; then
 			pkg_ports_var="${pkg_ports_var}_${pkg_flavor}"
 			pkg_ports="${pkg_ports}@${pkg_flavor}"
 		fi
+		# shellcheck disable=SC2016
 		printf '    ${WSPKG_PACKAGE_NAME_%s}>=a:%s ^%%' \
 			"${pkg_ports_var}" "${pkg_ports}"
 	done )
diff --git a/freebsd/freebsd.nopkg-setup.sh b/freebsd/freebsd.nopkg-setup.sh
index 8601c25..9fe1a4d 100755
--- a/freebsd/freebsd.nopkg-setup.sh
+++ b/freebsd/freebsd.nopkg-setup.sh
@@ -1,18 +1,20 @@
 #!/bin/sh
 
 ports_file="$1"
-: ${ports_file:="freebsd.ports"}
+: "${ports_file:="freebsd.ports"}"
 
-count=`wc -l < "${ports_file}"`
-tr '/' '_' < "${ports_file}" | paste "${ports_file}" - | (
+count=$(wc -l < "${ports_file}")
+# shellcheck disable=SC2094
+tr '/' '_' < "${ports_file}" | paste -- "${ports_file}" - | (
 	index=1
-	while read -r pkg_name pkg_ports pkg_flavor unused pkg_ports_var unused; do
+	while read -r _ pkg_ports pkg_flavor _ pkg_ports_var _; do
 		if [ "${pkg_flavor}" != "@" ]; then
 			pkg_ports_var="${pkg_ports_var}_${pkg_flavor}"
 			pkg_ports="${pkg_ports} FLAVOR=${pkg_flavor}"
 		fi
+		# shellcheck disable=SC2016
 		printf 'WSPKG_PACKAGE_NAME_%-40s != printf '\''\\\\r===> Generating package names (%5d/%5d)'\'' 1>\\&2; $(MAKE) -C ${PORTSDIR}/%-48s -V PKGNAMEPREFIX -V PORTNAME -V PKGNAMESUFFIX \\| tr -d '\''\\\\n'\''%%' \
 			"${pkg_ports_var}" "${index}" "${count}" "${pkg_ports}"
-		index=$(( ${index} + 1 ))
+		index=$(( index + 1 ))
 	done )
 printf 'WSPKG_PACKAGE_NAME_%-40s != echo 1>\\&2; echo %%' "NULL"
diff --git a/freebsd/freebsd.ports.sh b/freebsd/freebsd.ports.sh
index a35fb5e..97bf896 100755
--- a/freebsd/freebsd.ports.sh
+++ b/freebsd/freebsd.ports.sh
@@ -5,12 +5,12 @@ msg () {
 }
 
 [ -z "$1" ] && msg "Usage: $0 list_file" && exit 1
-: ${FREEBSD_VERSION:="`uname -r | sed 's|^\([0-9]*\).*$|\1|'`"}
-: ${PORTSDIR:="/usr/ports"}
+: "${FREEBSD_VERSION:="$(uname -r | sed 's|^\([0-9]*\).*$|\1|')"}"
+: "${PORTSDIR:="/usr/ports"}"
 index="${PORTSDIR}/INDEX-${FREEBSD_VERSION}"
 
 shdir="$(dirname "$0")"
-: ${shdir:="."}
+: "${shdir:="."}"
 
 msg "==> FreeBSD version is ${FREEBSD_VERSION}"
 msg "==> FreeBSD ports tree is ${PORTSDIR}"
diff --git a/wspkg-sh/packages-cpp.sh b/wspkg-sh/packages-cpp.sh
index ba251ac..b7a70b0 100755
--- a/wspkg-sh/packages-cpp.sh
+++ b/wspkg-sh/packages-cpp.sh
@@ -5,24 +5,24 @@ toupper () {
 }
 
 [ -z "$1" ] && printf 'Usage: %s input_file cpp_args\n' "$0" && exit 1
-[ -z "$2" ] && default="yes"
 
+# shellcheck disable=SC2034
 input_file="$1"
 shift
 
-: ${CPP:="cpp"}
-: ${CPPFLAGS:="-I."}
+: "${CPP:="cpp"}"
+: "${CPPFLAGS:="-I."}"
 while [ "$1" ]; do
     case "$1" in
         -*)
-            selarg="$selarg -D`toupper "$1"`"
+            selarg="$selarg -D$(toupper "$1")"
             ;;
         *)
-            selarg="$selarg -DWSPKG_`toupper "$1"`"
+            selarg="$selarg -DWSPKG_$(toupper "$1")"
             ;;
     esac
     shift
 done
 
-${CPP} ${CPPFLAGS} $selarg "$input_file" | \
+eval "${CPP} ${CPPFLAGS} $selarg "'"$input_file"' | \
     sed -e '/^#/d' -e '/^ *$/d' | tr ' ' '\n' | sed '/^ *$/d'