tools: lint osx shell scripts

PR-URL: https://github.com/nodejs/node/pull/42712
Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
Reviewed-By: Mestery <mestery@protonmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
This commit is contained in:
Livia Medeiros 2022-04-15 06:08:55 +08:00 committed by GitHub
parent 19064bec34
commit 30934e45d8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 6 deletions

View File

@ -3,16 +3,16 @@
# popups asking to accept incoming network connections when # popups asking to accept incoming network connections when
# running tests. # running tests.
SFW="/usr/libexec/ApplicationFirewall/socketfilterfw" SFW="/usr/libexec/ApplicationFirewall/socketfilterfw"
TOOLSDIR="`dirname \"$0\"`" TOOLSDIR="$(dirname "$0")"
TOOLSDIR="`( cd \"$TOOLSDIR\" && pwd) `" TOOLSDIR="$(cd "$TOOLSDIR" && pwd)"
ROOTDIR="`( cd \"$TOOLSDIR/..\" && pwd) `" ROOTDIR="$(cd "$TOOLSDIR/.." && pwd)"
OUTDIR="$TOOLSDIR/../out" OUTDIR="$TOOLSDIR/../out"
# Using cd and pwd here so that the path used for socketfilterfw does not # Using cd and pwd here so that the path used for socketfilterfw does not
# contain a '..', which seems to cause the rules to be incorrectly added # contain a '..', which seems to cause the rules to be incorrectly added
# and they are not removed when this script is re-run. Instead the new # and they are not removed when this script is re-run. Instead the new
# rules are simply appended. By using pwd we can get the full path # rules are simply appended. By using pwd we can get the full path
# without '..' and things work as expected. # without '..' and things work as expected.
OUTDIR="`( cd \"$OUTDIR\" && pwd) `" OUTDIR="$(cd "$OUTDIR" && pwd)"
NODE_RELEASE="$OUTDIR/Release/node" NODE_RELEASE="$OUTDIR/Release/node"
NODE_DEBUG="$OUTDIR/Debug/node" NODE_DEBUG="$OUTDIR/Debug/node"
NODE_LINK="$ROOTDIR/node" NODE_LINK="$ROOTDIR/node"

View File

@ -28,8 +28,7 @@ if [ ! -f "${gon_exe}" ]; then
(cd "${HOME}/.gon/" && rm -f gon && unzip "${gon_exe}.zip" && mv gon "${gon_exe}") (cd "${HOME}/.gon/" && rm -f gon && unzip "${gon_exe}.zip" && mv gon "${gon_exe}")
fi fi
cat tools/osx-gon-config.json.tmpl \ sed -e "s/{{appleid}}/${NOTARIZATION_ID}/" -e "s/{{pkgid}}/${pkgid}/" tools/osx-gon-config.json.tmpl \
| sed -e "s/{{appleid}}/${NOTARIZATION_ID}/" -e "s/{{pkgid}}/${pkgid}/" \
> gon-config.json > gon-config.json
"${gon_exe}" -log-level=info gon-config.json "${gon_exe}" -log-level=info gon-config.json