Commit f055faf
tools: improve macos-firewall.sh output
The output of tools/macos-firewall.sh can cause people to think it
didn't work. Update things slightly to make the output mildly more
informative.
Refs: #37233 (comment)
PR-URL: #37846
Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>1 parent 939f554 commit f055faf
1 file changed
Lines changed: 17 additions & 28 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -21,36 +21,25 @@ CCTEST_DEBUG="$OUTDIR/Debug/cctest" | |||
| 21 | 21 | OPENSSL_CLI_RELEASE="$OUTDIR/Release/openssl-cli" | |
| 22 | 22 | OPENSSL_CLI_DEBUG="$OUTDIR/Debug/openssl-cli" | |
| 23 | 23 | ||
| 24 | + add_and_unblock () { | ||
| 25 | + if [ -e "$1" ] | ||
| 26 | + then | ||
| 27 | + echo Processing "$1" | ||
| 28 | + $SFW --remove "$1" >/dev/null | ||
| 29 | + $SFW --add "$1" | ||
| 30 | + $SFW --unblock "$1" | ||
| 31 | + fi | ||
| 32 | + } | ||
| 33 | + | ||
| 24 | 34 | if [ -f $SFW ]; | |
| 25 | 35 | then | |
| 26 | - # Duplicating these commands on purpose as the symbolic link node might be | ||
| 27 | - # linked to either out/Debug/node or out/Release/node depending on the | ||
| 28 | - # BUILDTYPE. | ||
| 29 | - $SFW --remove "$NODE_DEBUG" | ||
| 30 | - $SFW --remove "$NODE_DEBUG" | ||
| 31 | - $SFW --remove "$NODE_RELEASE" | ||
| 32 | - $SFW --remove "$NODE_RELEASE" | ||
| 33 | - $SFW --remove "$NODE_LINK" | ||
| 34 | - $SFW --remove "$CCTEST_DEBUG" | ||
| 35 | - $SFW --remove "$CCTEST_RELEASE" | ||
| 36 | - $SFW --remove "$OPENSSL_CLI_DEBUG" | ||
| 37 | - $SFW --remove "$OPENSSL_CLI_RELEASE" | ||
| 38 | - | ||
| 39 | - $SFW --add "$NODE_DEBUG" | ||
| 40 | - $SFW --add "$NODE_RELEASE" | ||
| 41 | - $SFW --add "$NODE_LINK" | ||
| 42 | - $SFW --add "$CCTEST_DEBUG" | ||
| 43 | - $SFW --add "$CCTEST_RELEASE" | ||
| 44 | - $SFW --add "$OPENSSL_CLI_DEBUG" | ||
| 45 | - $SFW --add "$OPENSSL_CLI_RELEASE" | ||
| 46 | - | ||
| 47 | - $SFW --unblock "$NODE_DEBUG" | ||
| 48 | - $SFW --unblock "$NODE_RELEASE" | ||
| 49 | - $SFW --unblock "$NODE_LINK" | ||
| 50 | - $SFW --unblock "$CCTEST_DEBUG" | ||
| 51 | - $SFW --unblock "$CCTEST_RELEASE" | ||
| 52 | - $SFW --unblock "$OPENSSL_CLI_DEBUG" | ||
| 53 | - $SFW --unblock "$OPENSSL_CLI_RELEASE" | ||
| 36 | + add_and_unblock "$NODE_DEBUG" | ||
| 37 | + add_and_unblock "$NODE_RELEASE" | ||
| 38 | + add_and_unblock "$NODE_LINK" | ||
| 39 | + add_and_unblock "$CCTEST_DEBUG" | ||
| 40 | + add_and_unblock "$CCTEST_RELEASE" | ||
| 41 | + add_and_unblock "$OPENSSL_CLI_DEBUG" | ||
| 42 | + add_and_unblock "$OPENSSL_CLI_RELEASE" | ||
| 54 | 43 | else | |
| 55 | 44 | echo "SocketFirewall not found in location: $SFW" | |
| 56 | 45 | fi | |
0 commit comments