From 999a9984691dd087904f05cc4139f90e34dc68d1 Mon Sep 17 00:00:00 2001 From: Yoyo Zhou Date: Thu, 10 Dec 2015 14:43:35 -0800 Subject: [PATCH] Don't save __dirname into path.txt. Allows install to work even if our directory is moved later. --- npm/index.js | 2 +- npm/install.js | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/npm/index.js b/npm/index.js index 3dd25cc631..74b576ef9f 100644 --- a/npm/index.js +++ b/npm/index.js @@ -1,4 +1,4 @@ var fs = require('fs') var path = require('path') -module.exports = fs.readFileSync(path.join(__dirname, 'path.txt'), 'utf-8') +module.exports = path.join(__dirname, fs.readFileSync(path.join(__dirname, 'path.txt'), 'utf-8')) diff --git a/npm/install.js b/npm/install.js index 3d12327886..9551a9fa03 100755 --- a/npm/install.js +++ b/npm/install.js @@ -23,14 +23,14 @@ function onerror (err) { } var paths = { - darwin: path.join(__dirname, './dist/Electron.app/Contents/MacOS/Electron'), - linux: path.join(__dirname, './dist/electron'), - win32: path.join(__dirname, './dist/electron.exe') + darwin: 'dist/Electron.app/Contents/MacOS/Electron', + linux: 'dist/electron', + win32: 'dist/electron.exe' } if (!paths[platform]) throw new Error('Unknown platform: ' + platform) -if (installedVersion === version && fs.existsSync(paths[platform])) { +if (installedVersion === version && fs.existsSync(path.join(__dirname, paths[platform]))) { process.exit(0) }