Merge pull request #596 from atom/as-fix-missing-flags

Fix missing and hardcoded flags
atom · Jul 22, 2016 · 3b36e18 · 3b36e18
2 parents 546b337 + a5d4676
commit 3b36e18
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/src/dedupe.coffee b/src/dedupe.coffee
@@ -33,9 +33,10 @@ class Dedupe extends Command
 
  installNode: (callback) ->
  installNodeArgs = ['install']
+ installNodeArgs.push("--runtime=electron")
  installNodeArgs.push("--target=#{@electronVersion}")
  installNodeArgs.push("--dist-url=#{config.getElectronUrl()}")
- installNodeArgs.push('--arch=ia32')
+ installNodeArgs.push("--arch=#{config.getElectronArch()}")
  installNodeArgs.push('--ensure')
 
  env = _.extend({}, process.env, HOME: @atomNodeDirectory)
@@ -71,8 +72,9 @@ class Dedupe extends Command
 
  forkDedupeCommand: (options, callback) ->
  dedupeArgs = ['--globalconfig', config.getGlobalConfigPath(), '--userconfig', config.getUserConfigPath(), 'dedupe']
+ dedupeArgs.push("--runtime=electron")
  dedupeArgs.push("--target=#{@electronVersion}")
- dedupeArgs.push('--arch=ia32')
+ dedupeArgs.push("--arch=#{config.getElectronArch()}")
  dedupeArgs.push('--silent') if options.argv.silent
  dedupeArgs.push('--quiet') if options.argv.quiet
 

diff --git a/src/install.coffee b/src/install.coffee
@@ -60,6 +60,7 @@ class Install extends Command
 
  installNode: (callback) =>
  installNodeArgs = ['install']
+ installNodeArgs.push("--runtime=electron")
  installNodeArgs.push("--target=#{@electronVersion}")
  installNodeArgs.push("--dist-url=#{config.getElectronUrl()}")
  installNodeArgs.push("--arch=#{config.getElectronArch()}")
@@ -95,6 +96,7 @@ class Install extends Command
 
  installArgs = ['--globalconfig', config.getGlobalConfigPath(), '--userconfig', config.getUserConfigPath(), 'install']
  installArgs.push(modulePath)
+ installArgs.push("--runtime=electron")
  installArgs.push("--target=#{@electronVersion}")
  installArgs.push("--arch=#{config.getElectronArch()}")
  installArgs.push("--global-style") if installGlobally
@@ -189,6 +191,7 @@ class Install extends Command
 
  forkInstallCommand: (options, callback) ->
  installArgs = ['--globalconfig', config.getGlobalConfigPath(), '--userconfig', config.getUserConfigPath(), 'install']
+ installArgs.push("--runtime=electron")
  installArgs.push("--target=#{@electronVersion}")
  installArgs.push("--arch=#{config.getElectronArch()}")
  installArgs.push('--silent') if options.argv.silent
@@ -418,6 +421,7 @@ class Install extends Command
 
  buildArgs = ['--globalconfig', config.getGlobalConfigPath(), '--userconfig', config.getUserConfigPath(), 'build']
  buildArgs.push(path.resolve(__dirname, '..', 'native-module'))
+ buildArgs.push("--runtime=electron")
  buildArgs.push("--target=#{@electronVersion}")
  buildArgs.push("--arch=#{config.getElectronArch()}")
 

diff --git a/src/rebuild.coffee b/src/rebuild.coffee
@@ -43,6 +43,7 @@ class Rebuild extends Command
  '--userconfig'
  config.getUserConfigPath()
  'rebuild'
+ '--runtime=electron'
  "--target=#{@electronVersion}"
  "--arch=#{config.getElectronArch()}"
  ]