Add runas as devDependencies, or the python script will install it again and again.
The options of register_msdia80_dll.js should be admin. Fix the problem of runas not works cause it will escape command parameters by default.
This commit is contained in:
parent
24d615d428
commit
fa011c3d97
3 changed files with 11 additions and 19 deletions
|
@ -1,24 +1,21 @@
|
|||
{
|
||||
"name": "atom-shell",
|
||||
"version": "0.22.1",
|
||||
|
||||
"licenses": [
|
||||
{
|
||||
"type": "MIT",
|
||||
"url": "http://github.com/atom/atom-shell/raw/master/LICENSE.md"
|
||||
}
|
||||
],
|
||||
|
||||
"devDependencies": {
|
||||
"atom-package-manager": "0.144.0",
|
||||
"asar": "0.2.2",
|
||||
"atom-package-manager": "0.144.0",
|
||||
"coffee-script": "~1.7.1",
|
||||
"coffeelint": "~1.3.0",
|
||||
"request": "*"
|
||||
"request": "*",
|
||||
"runas": "^2.0.0"
|
||||
},
|
||||
|
||||
"private": true,
|
||||
|
||||
"scripts": {
|
||||
"preinstall": "node -e 'process.exit(0)'"
|
||||
}
|
||||
|
|
|
@ -29,8 +29,6 @@ def main():
|
|||
update_submodules()
|
||||
update_node_modules('.')
|
||||
bootstrap_brightray(args.url)
|
||||
if sys.platform in ['win32', 'cygwin']:
|
||||
install_runas()
|
||||
|
||||
create_chrome_version_h()
|
||||
touch_config_gypi()
|
||||
|
@ -96,14 +94,6 @@ def update_win32_python():
|
|||
if not os.path.exists('python_26'):
|
||||
execute_stdout(['git', 'clone', PYTHON_26_URL])
|
||||
|
||||
|
||||
def install_runas():
|
||||
# TODO This is needed by the tools/win/register_msdia80_dll.js, should move
|
||||
# this to a better place.
|
||||
with scoped_cwd(os.path.join(SOURCE_ROOT, 'tools', 'win')):
|
||||
execute_stdout([NPM, 'install', 'runas'])
|
||||
|
||||
|
||||
def create_chrome_version_h():
|
||||
version_file = os.path.join(SOURCE_ROOT, 'vendor', 'brightray', 'vendor',
|
||||
'libchromiumcontent', 'VERSION')
|
||||
|
|
|
@ -2,11 +2,16 @@ var fs = require('fs');
|
|||
var path = require('path');
|
||||
var runas = require('runas');
|
||||
|
||||
/* FIXME: C:\\Program Files\\ should comes from env variable
|
||||
And for 32 bit msdia80 is should be placed at %ProgramFiles(x86)% */
|
||||
var source = path.resolve(__dirname, '..', '..', 'vendor', 'breakpad', 'msdia80.dll');
|
||||
var target = 'C:\\Program Files\\Common Files\\Microsoft Shared\\VC\\msdia80.dll';
|
||||
if (fs.existsSync(target))
|
||||
return;
|
||||
|
||||
var copy = 'copy "' + source + '" "' + target + '"';
|
||||
var register = 'regsvr32 "' + target + '"';
|
||||
runas('cmd', ['/K', copy + ' & ' + register + ' & exit']);
|
||||
runas('cmd', ['/K',
|
||||
'copy', source, target,
|
||||
'&', 'regsvr32', '/s', target,
|
||||
'&', 'exit'],
|
||||
{admin:true}
|
||||
);
|
Loading…
Reference in a new issue