github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-01-25 23:08:18 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #19138 from atom/maintain-env-vars

Browse Source 
Calculate env vars when launching Atom from the desktop
This commit is contained in:
Rafael Oleza
2019-04-11 09:30:32 -07:00
committed by GitHub
parent b89fa55ab7 1a1468b61f
commit 3f2a702baa
3 changed files with 9 additions and 3 deletions
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
}