tools: remove bashisms from macOS release scripts

PR-URL: #36121
Reviewed-By: Rich Trott <[email protected]>

Author: aduh95

Makefile

@@ -978,7 +978,7 @@ $(PKG): release-only
 		--release-urlbase=$(RELEASE_URLBASE) \
 		$(CONFIG_FLAGS) $(BUILD_RELEASE_FLAGS)
 	$(MAKE) install V=$(V) DESTDIR=$(MACOSOUTDIR)/dist/node
-	SIGN="$(CODESIGN_CERT)" PKGDIR="$(MACOSOUTDIR)/dist/node/usr/local" bash \
+	SIGN="$(CODESIGN_CERT)" PKGDIR="$(MACOSOUTDIR)/dist/node/usr/local" sh \
 		tools/osx-codesign.sh
 	mkdir -p $(MACOSOUTDIR)/dist/npm/usr/local/lib/node_modules
 	mkdir -p $(MACOSOUTDIR)/pkgs
@@ -1000,8 +1000,8 @@ $(PKG): release-only
 	productbuild --distribution $(MACOSOUTDIR)/installer/productbuild/distribution.xml \
 		--resources $(MACOSOUTDIR)/installer/productbuild/Resources \
 		--package-path $(MACOSOUTDIR)/pkgs ./$(PKG)
-	SIGN="$(PRODUCTSIGN_CERT)" PKG="$(PKG)" bash tools/osx-productsign.sh
-	bash tools/osx-notarize.sh $(FULLVERSION)
+	SIGN="$(PRODUCTSIGN_CERT)" PKG="$(PKG)" sh tools/osx-productsign.sh
+	sh tools/osx-notarize.sh $(FULLVERSION)
 
 .PHONY: pkg
 # Builds the macOS installer for releases.
@@ -1119,7 +1119,7 @@ $(BINARYTAR): release-only
 	cp LICENSE $(BINARYNAME)
 	cp CHANGELOG.md $(BINARYNAME)
 ifeq ($(OSTYPE),darwin)
-	SIGN="$(CODESIGN_CERT)" PKGDIR="$(BINARYNAME)" bash tools/osx-codesign.sh
+	SIGN="$(CODESIGN_CERT)" PKGDIR="$(BINARYNAME)" sh tools/osx-codesign.sh
 endif
 	tar -cf $(BINARYNAME).tar $(BINARYNAME)
 	$(RM) -r $(BINARYNAME)

tools/osx-codesign.sh

@@ -1,17 +1,18 @@
-#!/bin/bash
+#!/bin/sh
 
 set -x
 set -e
 
-if [ "X$SIGN" == "X" ]; then
-  echo "No SIGN environment var.  Skipping codesign." >&2
+# shellcheck disable=SC2154
+[ -z "$SIGN" ] && \
+  echo "No SIGN environment var.  Skipping codesign." >&2 && \
   exit 0
-fi
 
 # All macOS executable binaries in the bundle must be codesigned with the
 # hardened runtime enabled.
 # See https://github.com/nodejs/node/pull/31459
 
+# shellcheck disable=SC2154
 codesign \
   --sign "$SIGN" \
   --entitlements tools/osx-entitlements.plist \

tools/osx-notarize.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 # Uses gon, from https://github.com/mitchellh/gon, to notarize a generated node-<version>.pkg file
 # with Apple for installation on macOS Catalina and later as validated by Gatekeeper.
@@ -8,18 +8,16 @@ set -e
 gon_version="0.2.2"
 gon_exe="${HOME}/.gon/gon_${gon_version}"
 
-__dirname="$(CDPATH= cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 pkgid="$1"
 
-if [ "X${pkgid}" == "X" ]; then
-  echo "Usage: $0 <pkgid>"
+[ -z "$pkgid" ] && \
+  echo "Usage: $0 <pkgid>" \
   exit 1
-fi
 
-if [ "X$NOTARIZATION_ID" == "X" ]; then
-  echo "No NOTARIZATION_ID environment var. Skipping notarization."
+# shellcheck disable=SC2154
+[ -z "$NOTARIZATION_ID" ] && \
+  echo "No NOTARIZATION_ID environment var. Skipping notarization." \
   exit 0
-fi
 
 set -x
 

tools/osx-productsign.sh

@@ -1,12 +1,14 @@
-#!/bin/bash
+#!/bin/sh
 
 set -x
 set -e
 
-if [ "X$SIGN" == "X" ]; then
-  echo "No SIGN environment var.  Skipping codesign." >&2
+# shellcheck disable=SC2154
+[ -z "$SIGN" ] && \
+  echo "No SIGN environment var.  Skipping codesign." >&2 && \
   exit 0
-fi
 
+# shellcheck disable=SC2154
 productsign --sign "$SIGN" "$PKG" "$PKG"-SIGNED
+# shellcheck disable=SC2154
 mv "$PKG"-SIGNED "$PKG"