Merge pull request #3077 from balena-io/fix-start-script

Fix start script
This commit is contained in:
Alexis Svinartchouk 2020-02-20 18:31:34 +01:00 committed by GitHub
commit 8eeb81f58e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 3 deletions

View File

@ -14,12 +14,16 @@ exports.default = function(context) {
cp.execFileSync('mv', [scriptPath, binPath])
fs.writeFileSync(
scriptPath,
outdent`
outdent({trimTrailingNewline: false})`
#!/bin/bash
# Resolve symlinks. Warning, readlink -f doesn't work on MacOS/BSD
script_dir="$(dirname "$(readlink -f "\${BASH_SOURCE[0]}")")"
if [[ $EUID -ne 0 ]] || [[ $ELECTRON_RUN_AS_NODE ]]; then
"\${BASH_SOURCE%/*}"/${context.packager.executableName}.bin "$@"
"\${script_dir}"/${context.packager.executableName}.bin "$@"
else
"\${BASH_SOURCE%/*}"/${context.packager.executableName}.bin "$@" --no-sandbox
"\${script_dir}"/${context.packager.executableName}.bin "$@" --no-sandbox
fi
`
)

View File

@ -17,6 +17,7 @@
import * as _ from 'lodash';
import * as path from 'path';
import * as SimpleProgressWebpackPlugin from 'simple-progress-webpack-plugin';
import { BannerPlugin } from 'webpack';
import * as nodeExternals from 'webpack-node-externals';
/**
@ -84,6 +85,14 @@ const guiConfig = {
gui: path.join(__dirname, 'lib', 'gui', 'app', 'app.ts'),
},
devtool: 'source-map',
plugins: [
...commonConfig.plugins,
// Remove "Download the React DevTools for a better development experience" message
new BannerPlugin({
banner: '__REACT_DEVTOOLS_GLOBAL_HOOK__ = { isDisabled: true };',
raw: true,
}),
],
};
const etcherConfig = {