tools: lint osx shell scripts

PR-URL: #42712 Reviewed-By: Antoine du Hamel <[email protected]> Reviewed-By: Mestery <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Luigi Pinca <[email protected]>
nodejs · May 31, 2022 · 2307371 · 2307371
1 parent 35b1f79
commit 2307371
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/tools/macos-firewall.sh b/tools/macos-firewall.sh
@@ -3,16 +3,16 @@
 # popups asking to accept incoming network connections when
 # running tests.
 SFW="/usr/libexec/ApplicationFirewall/socketfilterfw"
-TOOLSDIR="`dirname \"$0\"`"
-TOOLSDIR="`( cd \"$TOOLSDIR\" && pwd) `"
-ROOTDIR="`( cd \"$TOOLSDIR/..\" && pwd) `"
+TOOLSDIR="$(dirname "$0")"
+TOOLSDIR="$(cd "$TOOLSDIR" && pwd)"
+ROOTDIR="$(cd "$TOOLSDIR/.." && pwd)"
 OUTDIR="$TOOLSDIR/../out"
 # 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
 # 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
 # without '..' and things work as expected.
-OUTDIR="`( cd \"$OUTDIR\" && pwd) `"
+OUTDIR="$(cd "$OUTDIR" && pwd)"
 NODE_RELEASE="$OUTDIR/Release/node"
 NODE_DEBUG="$OUTDIR/Debug/node"
 NODE_LINK="$ROOTDIR/node"

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