Use bundled node binary in ./bin scripts

Author: fredrikekelund

bin/studio-cli.bat

@@ -8,20 +8,19 @@ set ORIGINAL_CP=%ORIGINAL_CP: =%
 rem Set code page to UTF-8
 chcp 65001 >nul
 
-set ELECTRON_EXECUTABLE=%~dp0..\..\Studio.exe
+set BUNDLED_NODE_EXECUTABLE=%~dp0node.exe
 set CLI_SCRIPT=%~dp0..\cli\main.js
 
 rem Prevent node from printing warnings about NODE_OPTIONS being ignored
 set NODE_OPTIONS=
 
-if exist "%ELECTRON_EXECUTABLE%" (
-    set ELECTRON_RUN_AS_NODE=1
-    call "%ELECTRON_EXECUTABLE%" "%CLI_SCRIPT%" %*
+if exist "%BUNDLED_NODE_EXECUTABLE%" (
+	call "%BUNDLED_NODE_EXECUTABLE%" "%CLI_SCRIPT%" %*
 ) else (
-    if not exist "%CLI_SCRIPT%" (
-        set CLI_SCRIPT=%~dp0..\dist\cli\main.js
-    )
-    call node "%CLI_SCRIPT%" %*
+	if not exist "%CLI_SCRIPT%" (
+		set CLI_SCRIPT=%~dp0..\dist\cli\main.js
+	)
+	call node "%CLI_SCRIPT%" %*
 )
 
 rem Restore original code page

bin/studio-cli.sh

@@ -1,19 +1,20 @@
 #!/bin/sh
 
-# The default assumption is that this script lives in `/Applications/Studio.app/Contents/Resources/bin/studio-cli.sh`
-CONTENTS_DIR=$(dirname "$(dirname "$(dirname "$(realpath "$0")")")")
-ELECTRON_EXECUTABLE="$CONTENTS_DIR/MacOS/Studio"
+# The assumption is that this script lives in `/Applications/Studio.app/Contents/Resources/bin/studio-cli.sh`
+BIN_DIR=$(dirname "$(realpath "$0")")
+BUNDLED_NODE_EXECUTABLE="$BIN_DIR/node"
+CONTENTS_DIR=$(dirname "$(dirname "$BIN_DIR")")
 CLI_SCRIPT="$CONTENTS_DIR/Resources/cli/main.js"
 
-if [ -x "$ELECTRON_EXECUTABLE" ]; then
+if [ -x "$BUNDLED_NODE_EXECUTABLE" ]; then
 	# Prevent node from printing warnings about NODE_OPTIONS being ignored
 	unset NODE_OPTIONS
-	ELECTRON_RUN_AS_NODE=1 exec "$ELECTRON_EXECUTABLE" "$CLI_SCRIPT" "$@"
+	exec "$BUNDLED_NODE_EXECUTABLE" "$CLI_SCRIPT" "$@"
 else
 	# If the default script path is not found, assume that this script lives in the development directory
 	# and look for the CLI JS bundle in the `./dist` directory
 	if ! [ -f "$CLI_SCRIPT" ]; then
-		SCRIPT_DIR=$(dirname $(dirname "$(realpath "$0")"))
+		SCRIPT_DIR=$(dirname "$(dirname "$(realpath "$0")")")
 		CLI_SCRIPT="$SCRIPT_DIR/dist/cli/main.js"
 	fi