opensourcemirror
/
Atom
mirror of https://github.com/atom/atom.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Calculate env vars when launching Atom from the desktop

This commit is contained in:
Rafael Oleza 2019-04-11 17:10:38 +02:00
parent b89fa55ab7
commit 1a1468b61f
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
atom.sh
View File

@ -24,7 +24,11 @@ case $(basename $0) in
;;
esac
export ATOM_DISABLE_SHELLING_OUT_FOR_ENVIRONMENT=true
# Only set the ATOM_DISABLE_SHELLING_OUT_FOR_ENVIRONMENT env var if it hasn't been set.
if [ -z "$ATOM_DISABLE_SHELLING_OUT_FOR_ENVIRONMENT" ]
then
export ATOM_DISABLE_SHELLING_OUT_FOR_ENVIRONMENT=true
fi
ATOM_ADD=false
ATOM_NEW_WINDOW=false

2
resources/linux/atom.desktop.in
View File

@ -2,7 +2,7 @@
Name=<%= appName %>
Comment=<%= description %>
GenericName=Text Editor
Exec=<%= installDir %>/bin/<%= appFileName %> %F
Exec=env ATOM_DISABLE_SHELLING_OUT_FOR_ENVIRONMENT=false <%= installDir %>/bin/<%= appFileName %> %F
Icon=<%= iconPath %>
Type=Application
StartupNotify=true

4
src/update-process-env.js
View File

@ -51,7 +51,9 @@ function shouldGetEnvFromShell (env) {
return false
}
if (env.ATOM_DISABLE_SHELLING_OUT_FOR_ENVIRONMENT || process.env.ATOM_DISABLE_SHELLING_OUT_FOR_ENVIRONMENT) {
const disableSellingOut = env.ATOM_DISABLE_SHELLING_OUT_FOR_ENVIRONMENT || process.env.ATOM_DISABLE_SHELLING_OUT_FOR_ENVIRONMENT
if (disableSellingOut === 'true') {
return false
}