Merge pull request docker-library#26 from polyverse/archis/macos-compat

Make update scripts MacOS compat

Author: archis-polyverse

apply-templates.sh

@@ -1,7 +1,26 @@
 #!/usr/bin/env bash
 set -Eeuo pipefail
 
-[ -f versions.json ] # run "versions.sh" first
+# Don't tolerate outdated bash on Darwin
+[ "${BASH_VERSINFO:-0}" -ge 4 ] || ( echo "Outdated bash version: ${BASH_VERSION}. If you're on MacOS/Darwin, please 'brew install bash' to move away from this comically outdated version." && exit 1)
+
+[ -f versions.json ] || (echo "run 'versions.sh' first so templates can be applied to the right versions" && exit 1)
+
+type gawk >/dev/null 2>&1 || (echo "Please install the gawk command. On MacOS, run 'brew install gawk'" && exit 1)
+
+# GNU sed for Mac.
+# Copied from:
+# https://gist.github.com/bittner/5436f3dc011d43ab7551#file-gnu-tools-for-mac-sh
+sedcmd="sed"
+
+[[ `uname` == 'Darwin' ]] && {
+	which gsed > /dev/null && {
+		sedcmd="gsed"
+	} || {
+		echo 'ERROR: GNU sed required for Mac. You may use homebrew to install it: brew install gnu-sed'
+		exit 1
+	}
+}
 
 jqt='.jq-template.awk'
 if [ -n "${BASHBREW_SCRIPTS:-}" ]; then
@@ -76,7 +95,7 @@ for version; do
 
 		cmd="$(jq <<<"$cmd" -r '.[0]')"
 		if [ "$cmd" != 'php' ]; then
-			sed -i -e 's! php ! '"$cmd"' !g' "$version/$dir/docker-php-entrypoint"
+			$sedcmd -i -e 's! php ! '"$cmd"' !g' "$version/$dir/docker-php-entrypoint"
 		fi
 	done
 done

update.sh

@@ -1,7 +1,29 @@
 #!/usr/bin/env bash
 set -Eeuo pipefail
 
-cd "$(dirname "$(readlink -f "$BASH_SOURCE")")"
+# Don't tolerate outdated bash on Darwin
+[ "${BASH_VERSINFO:-0}" -ge 4 ] || ( echo "Outdated bash version: ${BASH_VERSION}. If you're on MacOS/Darwin, please 'brew install bash' to move away from this comically outdated version." && exit 1)
+
+# Substitute for readlink that works on MacOS/Darwin.
+# Copied from: https://stackoverflow.com/questions/29836821/how-does-this-os-x-bash-script-that-emulates-linuxs-readlink-work
+function abspath() {
+  pushd . > /dev/null;
+  if [ -d "$1" ]; then
+    cd "$1";
+    dirs -l +0;
+  else
+    cd "`dirname \"$1\"`";
+    cur_dir=`dirs -l +0`;
+    if [ "$cur_dir" == "/" ]; then
+      echo "$cur_dir`basename \"$1\"`";
+    else
+      echo "$cur_dir/`basename \"$1\"`";
+    fi;
+  fi;
+  popd > /dev/null;
+}
+
+cd "$(dirname "$(abspath "$BASH_SOURCE")")"
 
 ./versions.sh "$@"
 ./apply-templates.sh "$@"

versions.sh

@@ -1,6 +1,28 @@
 #!/usr/bin/env bash
 set -Eeuo pipefail
 
+# Don't tolerate outdated bash on Darwin
+[ "${BASH_VERSINFO:-0}" -ge 4 ] || ( echo "Outdated bash version: ${BASH_VERSION}. If you're on MacOS/Darwin, please 'brew install bash' to move away from this comically outdated version." && exit 1)
+
+# Substitute for readlink that works on MacOS/Darwin.
+# Copied from: https://stackoverflow.com/questions/29836821/how-does-this-os-x-bash-script-that-emulates-linuxs-readlink-work
+function abspath() {
+  pushd . > /dev/null;
+  if [ -d "$1" ]; then
+    cd "$1";
+    dirs -l +0;
+  else
+    cd "`dirname \"$1\"`";
+    cur_dir=`dirs -l +0`;
+    if [ "$cur_dir" == "/" ]; then
+      echo "$cur_dir`basename \"$1\"`";
+    else
+      echo "$cur_dir/`basename \"$1\"`";
+    fi;
+  fi;
+  popd > /dev/null;
+}
+
 # https://www.php.net/gpg-keys.php
 declare -A gpgKeys=(
 	# https://wiki.php.net/todo/php81
@@ -31,7 +53,7 @@ declare -A gpgKeys=(
 )
 # see https://www.php.net/downloads.php
 
-cd "$(dirname "$(readlink -f "$BASH_SOURCE")")"
+cd "$(dirname "$(abspath "$BASH_SOURCE")")"
 
 versions=( "$@" )
 if [ ${#versions[@]} -eq 0 ]; then
@@ -43,6 +65,14 @@ fi
 versions=( "${versions[@]%/}" )
 
 for version in "${versions[@]}"; do
+	# Versions begin with a digit
+	if ! [[ $version =~ [0-9].* ]]; then
+		echo "Ignoring directory $version, since versions must begin with a digit."
+		continue
+	fi
+
+	echo "Looking up php at version $version..."
+
 	rcVersion="${version%-rc}"
 	export version rcVersion