Save node binary with name flipper-runtime
Summary: As discussed with lblasa. This solves a few issues: - Confusing names in `ps` and Activity Monitor related to Flipper. - Permission requests for the Keychain from "node" lead users to deny it. - Seeing "node" as allowed apps for an entry in Keychain is confusing. Reviewed By: lblasa Differential Revision: D50232337 fbshipit-source-id: 3bc92aae0ca31d1a80582fb8a794bbc64fc2f2e5
This commit is contained in:
committed by
Facebook GitHub Bot
parent
436203161d
commit
0134b66f37
@@ -53,14 +53,14 @@ enum BuildPlatform {
|
|||||||
const LINUX_STARTUP_SCRIPT = `#!/bin/sh
|
const LINUX_STARTUP_SCRIPT = `#!/bin/sh
|
||||||
THIS_DIR="$( cd "$( dirname "\${BASH_SOURCE[0]}" )" && pwd )"
|
THIS_DIR="$( cd "$( dirname "\${BASH_SOURCE[0]}" )" && pwd )"
|
||||||
cd "$THIS_DIR"
|
cd "$THIS_DIR"
|
||||||
./node ./server "$@"
|
./flipper-runtime ./server "$@"
|
||||||
`;
|
`;
|
||||||
|
|
||||||
const WINDOWS_STARTUP_SCRIPT = `@echo off
|
const WINDOWS_STARTUP_SCRIPT = `@echo off
|
||||||
setlocal
|
setlocal
|
||||||
set "THIS_DIR=%~dp0"
|
set "THIS_DIR=%~dp0"
|
||||||
cd /d "%THIS_DIR%"
|
cd /d "%THIS_DIR%"
|
||||||
node server %*
|
flipper-runtime server %*
|
||||||
`;
|
`;
|
||||||
|
|
||||||
const argv = yargs
|
const argv = yargs
|
||||||
@@ -697,7 +697,7 @@ async function setUpMacBundle(
|
|||||||
'Flipper.app',
|
'Flipper.app',
|
||||||
'Contents',
|
'Contents',
|
||||||
'MacOS',
|
'MacOS',
|
||||||
'node',
|
'flipper-runtime',
|
||||||
);
|
);
|
||||||
return {resourcesPath: resourcesOutputDir, nodePath: nodeOutputPath};
|
return {resourcesPath: resourcesOutputDir, nodePath: nodeOutputPath};
|
||||||
}
|
}
|
||||||
@@ -715,7 +715,7 @@ async function bundleServerReleaseForPlatform(
|
|||||||
await fs.mkdirp(outputDir);
|
await fs.mkdirp(outputDir);
|
||||||
|
|
||||||
let outputPaths = {
|
let outputPaths = {
|
||||||
nodePath: path.join(outputDir, 'node'),
|
nodePath: path.join(outputDir, 'flipper-runtime'),
|
||||||
resourcesPath: outputDir,
|
resourcesPath: outputDir,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
|
|
||||||
SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
|
SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
||||||
NODE_PATH="${SCRIPT_PATH}/node"
|
NODE_PATH="${SCRIPT_PATH}/flipper-runtime"
|
||||||
SERVER_RESOURCES="$SCRIPT_PATH/../Resources/server"
|
SERVER_RESOURCES="$SCRIPT_PATH/../Resources/server"
|
||||||
|
|
||||||
cd "$SERVER_RESOURCES" || exit 1
|
cd "$SERVER_RESOURCES" || exit 1
|
||||||
@@ -9,6 +9,6 @@ echo "Starting flipper-server ..."
|
|||||||
"$NODE_PATH" . "$@" &
|
"$NODE_PATH" . "$@" &
|
||||||
|
|
||||||
# Wait for the Flipper HTTP server to start listening
|
# Wait for the Flipper HTTP server to start listening
|
||||||
while ! curl -s http://localhost:52342 > /dev/null; do
|
while ! curl -s http://localhost:52342 >/dev/null; do
|
||||||
sleep 1
|
sleep 1
|
||||||
done
|
done
|
||||||
|
|||||||
Reference in New Issue
Block a user