Make scripts POSIX compliant.

Author: blueimp

bin/docker-build-images.sh

@@ -1,5 +1,4 @@
 #!/bin/sh
-# shellcheck shell=dash
 
 #
 # Builds images for each Dockerfile found recursively in the given directory.
@@ -31,19 +30,16 @@ normalize() {
 
 # Build and tag the image based on the git branches in the current directory:
 build_versions() {
-	local image="$1"
+	image="$1"
 	shift
 	if [ ! -d '.git' ]; then
 		# Not a git repository, so simply build a "latest" image version:
 		docker build -t "$image" "$@" .
 		return $?
 	fi
-	local current_branch
 	current_branch=$(git rev-parse --abbrev-ref HEAD)
 	# Iterate over all branches:
-	local branches
 	branches=$(git for-each-ref --format='%(refname:short)' refs/heads/)
-	local branch
 	for branch in $branches; do
 		git checkout "$branch"
 		# Tag master as "latest":
@@ -60,33 +56,29 @@ build_versions() {
 
 # Builds an image for each git branch of the given Dockerfile directory:
 build() {
-	local cwd="$PWD"
-	local file
+	cwd="$PWD"
 	file="$(basename "$1")"
-	local dir
 	dir="$(dirname "$1")"
 	cd "$dir" || return 1
-	local organization="$DOCKER_ORG"
+	organization="$DOCKER_ORG"
 	if [ -z "$organization" ]; then
 		# Use the parent folder for the organization/user name:
 		organization="$(cd .. && normalize "$(basename "$PWD")")"
 	fi
 	if [ -n "$DOCKER_HUB" ]; then
 		organization="$DOCKER_HUB/$organization"
 	fi
-	local image
 	# Use the current folder for the image name:
 	image="$organization/$(normalize "$(basename "$PWD")")"
 	# Check if the image depends on another image of the same organization:
-	local from
 	from=$(grep "^FROM $organization/" "$file" | awk '{print $2}')
 	# If it does, only build if the image is already available:
 	if [ -z "$from" ] || docker inspect "$from" > /dev/null 2>&1; then
 		build_versions "$image" -f "$file"
 	else
 		echo "$image requires $from ..." >&2 && false
 	fi
-	local status=$?
+	status=$?
 	cd "$cwd" || return 1
 	return $status
 }
@@ -105,7 +97,6 @@ build_images() {
 		echo 'Could not resolve image dependencies.' >&2
 		return 1
 	fi
-	local file
 	for file; do
 		# Shift the arguments list to remove the current Dockerfile:
 		shift
@@ -130,8 +121,7 @@ NEWLINE='
 
 # Parses the arguments, finds Dockerfiles and starts the builds:
 init() {
-	local args=''
-	local arg
+	args=''
 	for arg; do
 		if [ -d "$arg" ]; then
 			# Search for Dockerfiles and add them to the list:

bin/docker-image-exists.sh

@@ -1,5 +1,4 @@
 #!/bin/sh
-# shellcheck shell=dash
 
 #
 # Checks if a given docker image exists.

bin/envconfig.sh

@@ -1,5 +1,4 @@
 #!/bin/sh
-# shellcheck shell=dash
 
 #
 # Wrapper script to write environment variables in config files.
@@ -84,16 +83,15 @@ gsub() {
 # Parses the given config file and writes the env config:
 write_envconfig() {
   # Store variables to unset in a space-separated list:
-  local unset_variables=''
+  unset_variables=''
   # Set the platform dependent base64 decode argument:
-  local B64_DECODE_ARG
   B64_DECODE_ARG="$(b64_decode_arg)"
   # Iterate over each line of the config file:
   while read -r line; do
     # Skip empty lines and lines starting with a hash (#):
     [ -z "$line" ] || [ "${line#\#}" != "$line" ] && continue
     # Extract the substring up to the first space as variable name:
-    local name="${line%% *}"
+    name="${line%% *}"
     # Check if the variable should be unset (no exclamation mark prefix):
     if [ "${name#!}" = "$name" ]; then
       # Store the name and its variants in the list of variables to unset:
@@ -103,10 +101,9 @@ write_envconfig() {
       name="${name#!}"
     fi
     # Extract the substring after the last space as file path:
-    local path="${line##* }"
+    path="${line##* }"
     # Check if the file exists and has a size greater than zero:
     if [ -s "$path" ]; then
-      local tmpfile
       tmpfile="$(mktemp "${TMPDIR:-/tmp}/$name.XXXXXXXXXX")"
       # Replace the placeholder with the environment variable:
       gsub "{{$name}}" "$(interpolate "$name")" < "$path" > "$tmpfile"

bin/github-release.sh

@@ -101,7 +101,6 @@ upload_release_asset() {
 publish_release() {
   # shellcheck disable=SC2059
   data="$(printf "$RELEASE_TEMPLATE" "$TAG" "$TAG" "$PRE" false)"
-  # shellcheck disable=SC2059
   curl \
     --silent \
     --fail \

bin/log.sh

@@ -1,5 +1,4 @@
 #!/bin/sh
-# shellcheck shell=dash
 
 #
 # Executes the given command and logs the output.
@@ -73,7 +72,6 @@ get_log() {
 
 # Processes stdin and logs each line:
 process() {
-  local log
   log=$(get_log "$1")
   while read -r line; do
     $log "$1" "$line"
@@ -82,7 +80,7 @@ process() {
 
 # Returns a string with the quoted arguments:
 quote() {
-  local args=""
+  args=''
   for arg; do
     # Escape single quotes:
     arg="$(echo "$arg" | sed "s/'/'\\\\''/g")"

bin/mail.sh

@@ -21,7 +21,6 @@ set -e
 HOST=localhost
 PORT=25
 USER=${USER:-user}
-# shellcheck disable=SC2169
 HOSTNAME=${HOSTNAME:-localhost}
 FROM="$USER <$USER@$HOSTNAME>"
 TO='test <[email protected]>'

bin/superd.sh

@@ -1,5 +1,4 @@
 #!/bin/sh
-# shellcheck shell=dash
 
 #
 # Supervisor daemon to manage long running processes as a group.
@@ -47,7 +46,6 @@ startup() {
 
 # Returns all given processes and their descendants tree as flat list:
 collect() {
-  local pid
   for pid in "$@"; do
     printf ' %s' "$pid"
   	# shellcheck disable=SC2046
@@ -57,7 +55,6 @@ collect() {
 
 # Terminates the given list of processes:
 terminate() {
-  local pid
   for pid in "$@"; do
     # Terminate the given process, ignore stdout and stderr output:
     kill "$pid" > /dev/null 2>&1
@@ -74,7 +71,6 @@ shutdown() {
 
 # Monitors the started background processes until one of them exits:
 monitor() {
-  local pid
   while true; do
     for pid in $PIDS; do
       # Return if the given process is not running: