Commit 18ae2c3
tools: lint osx shell scripts
PR-URL: #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>1 parent d652b5f commit 18ae2c3
2 files changed
Lines changed: 5 additions & 6 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -3,16 +3,16 @@ | |||
| 3 | 3 | # popups asking to accept incoming network connections when | |
| 4 | 4 | # running tests. | |
| 5 | 5 | SFW="/usr/libexec/ApplicationFirewall/socketfilterfw" | |
| 6 | - TOOLSDIR="`dirname \"$0\"`" | ||
| 7 | - TOOLSDIR="`( cd \"$TOOLSDIR\" && pwd) `" | ||
| 8 | - ROOTDIR="`( cd \"$TOOLSDIR/..\" && pwd) `" | ||
| 6 | + TOOLSDIR="$(dirname "$0")" | ||
| 7 | + TOOLSDIR="$(cd "$TOOLSDIR" && pwd)" | ||
| 8 | + ROOTDIR="$(cd "$TOOLSDIR/.." && pwd)" | ||
| 9 | 9 | OUTDIR="$TOOLSDIR/../out" | |
| 10 | 10 | # Using cd and pwd here so that the path used for socketfilterfw does not | |
| 11 | 11 | # contain a '..', which seems to cause the rules to be incorrectly added | |
| 12 | 12 | # and they are not removed when this script is re-run. Instead the new | |
| 13 | 13 | # rules are simply appended. By using pwd we can get the full path | |
| 14 | 14 | # without '..' and things work as expected. | |
| 15 | - OUTDIR="`( cd \"$OUTDIR\" && pwd) `" | ||
| 15 | + OUTDIR="$(cd "$OUTDIR" && pwd)" | ||
| 16 | 16 | NODE_RELEASE="$OUTDIR/Release/node" | |
| 17 | 17 | NODE_DEBUG="$OUTDIR/Debug/node" | |
| 18 | 18 | NODE_LINK="$ROOTDIR/node" | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -28,8 +28,7 @@ if [ ! -f "${gon_exe}" ]; then | |||
| 28 | 28 | (cd "${HOME}/.gon/" && rm -f gon && unzip "${gon_exe}.zip" && mv gon "${gon_exe}") | |
| 29 | 29 | fi | |
| 30 | 30 | ||
| 31 | - cat tools/osx-gon-config.json.tmpl \ | ||
| 32 | - | sed -e "s/{{appleid}}/${NOTARIZATION_ID}/" -e "s/{{pkgid}}/${pkgid}/" \ | ||
| 31 | + sed -e "s/{{appleid}}/${NOTARIZATION_ID}/" -e "s/{{pkgid}}/${pkgid}/" tools/osx-gon-config.json.tmpl \ | ||
| 33 | 32 | > gon-config.json | |
| 34 | 33 | ||
| 35 | 34 | "${gon_exe}" -log-level=info gon-config.json | |
0 commit comments