diff --git a/script/bootstrap b/script/bootstrap index e4ddeeffd..eaad1e292 100755 --- a/script/bootstrap +++ b/script/bootstrap @@ -33,7 +33,7 @@ function printArgs(args) { function makeSqlite3Command() { var npmPath = path.resolve(__dirname, '..', 'build', 'node_modules', '.bin', 'npm'); - var nodeGypPath = path.resolve(__dirname, '..', 'build', 'node_modules', '.bin', 'node-gyp'); + var nodeGypPath = path.resolve(__dirname, '..', 'build', 'node_modules', 'npm', 'node_modules', '.bin', 'node-gyp'); var appPackageJSON = JSON.parse(fs.readFileSync(path.resolve(__dirname, '..', 'package.json'))); var targetVersion = appPackageJSON['electronVersion']; var targetPlatform = require('os').platform(); @@ -43,7 +43,7 @@ function makeSqlite3Command() { // Unless electron for windows goes 64bit, this should stay throw new Error("Building for win32 with architecture "+targetArch+". Are you sure you meant to do this?"); } - return npmPath+" install https://github.com/bengotow/node-sqlite3/archive/master.tar.gz --ignore-scripts && cd node_modules/sqlite3 && "+npmPath+" run prepublish && "+nodeGypPath+" configure --module_name=node_sqlite3 --module_path=../lib/binding/node-v44-"+targetPlatform+"-"+targetArch+" && "+nodeGypPath+" rebuild --target="+targetVersion+" --arch="+targetArch+" --target_platform="+targetPlatform+" --dist-url=https://atom.io/download/atom-shell --module_name=node_sqlite3 --module_path=../lib/binding/node-v44-"+targetPlatform+"-"+targetArch + return npmPath+" install https://github.com/bengotow/node-sqlite3/archive/master.tar.gz --ignore-scripts && cd node_modules/sqlite3 && "+npmPath+" run prepublish && "+nodeGypPath+" configure rebuild --target="+targetVersion+" --arch="+targetArch+" --target_platform="+targetPlatform+" --dist-url=https://atom.io/download/atom-shell --module_name=node_sqlite3 --module_path=../lib/binding/node-v44-"+targetPlatform+"-"+targetArch } function bootstrap() {