GeezerVison

The World Wide Web, restored to 800 pixels of glory.

GeezerVison is showing github.com — tools: remove bashisms from macOS release scripts · nodejs/node@a033910

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

Makefile
tools

Expand file treeCollapse file tree

Open diff view settings

Collapse file

`‎Makefile‎`

Copy file name to clipboardExpand all lines: Makefile

+4-4Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -978,7 +978,7 @@ $(PKG): release-only`
`978`	`978`	`--release-urlbase=$(RELEASE_URLBASE) \`
`979`	`979`	`$(CONFIG_FLAGS) $(BUILD_RELEASE_FLAGS)`
`980`	`980`	`$(MAKE) install V=$(V) DESTDIR=$(MACOSOUTDIR)/dist/node`
`981`		`- SIGN="$(CODESIGN_CERT)" PKGDIR="$(MACOSOUTDIR)/dist/node/usr/local" bash \`
	`981`	`+ SIGN="$(CODESIGN_CERT)" PKGDIR="$(MACOSOUTDIR)/dist/node/usr/local" sh \`
`982`	`982`	`tools/osx-codesign.sh`
`983`	`983`	`mkdir -p $(MACOSOUTDIR)/dist/npm/usr/local/lib/node_modules`
`984`	`984`	`mkdir -p $(MACOSOUTDIR)/pkgs`
`@@ -1000,8 +1000,8 @@ $(PKG): release-only`
`1000`	`1000`	`productbuild --distribution $(MACOSOUTDIR)/installer/productbuild/distribution.xml \`
`1001`	`1001`	`--resources $(MACOSOUTDIR)/installer/productbuild/Resources \`
`1002`	`1002`	`--package-path $(MACOSOUTDIR)/pkgs ./$(PKG)`
`1003`		`- SIGN="$(PRODUCTSIGN_CERT)" PKG="$(PKG)" bash tools/osx-productsign.sh`
`1004`		`- bash tools/osx-notarize.sh $(FULLVERSION)`
	`1003`	`+ SIGN="$(PRODUCTSIGN_CERT)" PKG="$(PKG)" sh tools/osx-productsign.sh`
	`1004`	`+ sh tools/osx-notarize.sh $(FULLVERSION)`
`1005`	`1005`
`1006`	`1006`	`.PHONY: pkg`
`1007`	`1007`	`# Builds the macOS installer for releases.`
`@@ -1119,7 +1119,7 @@ $(BINARYTAR): release-only`
`1119`	`1119`	`cp LICENSE $(BINARYNAME)`
`1120`	`1120`	`cp CHANGELOG.md $(BINARYNAME)`
`1121`	`1121`	`ifeq ($(OSTYPE),darwin)`
`1122`		`- SIGN="$(CODESIGN_CERT)" PKGDIR="$(BINARYNAME)" bash tools/osx-codesign.sh`
	`1122`	`+ SIGN="$(CODESIGN_CERT)" PKGDIR="$(BINARYNAME)" sh tools/osx-codesign.sh`
`1123`	`1123`	`endif`
`1124`	`1124`	`tar -cf $(BINARYNAME).tar $(BINARYNAME)`
`1125`	`1125`	`$(RM) -r $(BINARYNAME)`

Collapse file

`‎tools/osx-codesign.sh‎`

Copy file name to clipboardExpand all lines: tools/osx-codesign.sh

+5-4Lines changed: 5 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,17 +1,18 @@`
`1`		`-#!/bin/bash`
	`1`	`+#!/bin/sh`
`2`	`2`
`3`	`3`	`set -x`
`4`	`4`	`set -e`
`5`	`5`
`6`		`-if [ "X$SIGN" == "X" ]; then`
`7`		`- echo "No SIGN environment var. Skipping codesign." >&2`
	`6`	`+# shellcheck disable=SC2154`
	`7`	`+[ -z "$SIGN" ] && \`
	`8`	`+ echo "No SIGN environment var. Skipping codesign." >&2 && \`
`8`	`9`	`exit 0`
`9`		`-fi`
`10`	`10`
`11`	`11`	`# All macOS executable binaries in the bundle must be codesigned with the`
`12`	`12`	`# hardened runtime enabled.`
`13`	`13`	`# See https://github.com/nodejs/node/pull/31459`
`14`	`14`
	`15`	`+# shellcheck disable=SC2154`
`15`	`16`	`codesign \`
`16`	`17`	`--sign "$SIGN" \`
`17`	`18`	`--entitlements tools/osx-entitlements.plist \`

Collapse file

`‎tools/osx-notarize.sh‎`

Copy file name to clipboardExpand all lines: tools/osx-notarize.sh

+6-8Lines changed: 6 additions & 8 deletions

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

Collapse file

`‎tools/osx-productsign.sh‎`

Copy file name to clipboard

+6-4Lines changed: 6 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,12 +1,14 @@`
`1`		`-#!/bin/bash`
	`1`	`+#!/bin/sh`
`2`	`2`
`3`	`3`	`set -x`
`4`	`4`	`set -e`
`5`	`5`
`6`		`-if [ "X$SIGN" == "X" ]; then`
`7`		`- echo "No SIGN environment var. Skipping codesign." >&2`
	`6`	`+# shellcheck disable=SC2154`
	`7`	`+[ -z "$SIGN" ] && \`
	`8`	`+ echo "No SIGN environment var. Skipping codesign." >&2 && \`
`8`	`9`	`exit 0`
`9`		`-fi`
`10`	`10`
	`11`	`+# shellcheck disable=SC2154`
`11`	`12`	`productsign --sign "$SIGN" "$PKG" "$PKG"-SIGNED`
	`13`	`+# shellcheck disable=SC2154`
`12`	`14`	`mv "$PKG"-SIGNED "$PKG"`

0 commit comments

Comments

0 (0)

You are visitor 01402503 — GeezerVison does not store the pages you look up.
Best viewed with Netscape Navigator 4.7 or Internet Explorer 6 at 800×600. No cookies required.