fix ASAR path again

Benjamin Pasero · Benjamin Pasero · commit d649ac014dae · 2018-09-07T19:30:50.000+02:00
diff --git a/src/bootstrap-window.js b/src/bootstrap-window.js
@@ -36,7 +36,6 @@ exports.assign = function assign(destination, source) {
 exports.load = function (modulePaths, resultCallback, options) {
 	// @ts-ignore
 	const webFrame = require('electron').webFrame;
-	const path = require('path');
 
 	const args = exports.parseURLQueryArgs();
 	const configuration = JSON.parse(args['config'] || '{}') || {};
@@ -56,14 +55,7 @@ exports.load = function (modulePaths, resultCallback, options) {
 	exports.assign(process.env, configuration.userEnv);
 
 	// Enable ASAR support
-	// Note: On windows we have to be careful about the drive letter casing. If
-	// the drive letter case is lowercase, we convert it to uppercase. DO NOT
-	// CHANGE THIS logic or otherwise loading will fail in windows.
-	let nodeModulesPath = path.join(configuration.appRoot, 'node_modules');
-	if (process.platform === 'win32' && /[a-z]\:/.test(nodeModulesPath)) {
-		nodeModulesPath = nodeModulesPath.charAt(0).toUpperCase() + nodeModulesPath.substr(1); // Make drive letter uppercase
-	}
-	bootstrap.enableASARSupport(nodeModulesPath);
+	bootstrap.enableASARSupport();
 
 	// disable pinch zoom & apply zoom level early to avoid glitches
 	const zoomLevel = configuration.zoomLevel;
diff --git a/src/bootstrap.js b/src/bootstrap.js
@@ -21,18 +21,11 @@ process.on('SIGPIPE', () => {
 //#endregion
 
 //#region Add support for using node_modules.asar
-/**
- * @param {string=} nodeModulesPath
- */
-exports.enableASARSupport = function (nodeModulesPath) {
+exports.enableASARSupport = function () {
 	// @ts-ignore
 	const Module = require('module');
 	const path = require('path');
-	let NODE_MODULES_PATH = nodeModulesPath;
-	if (!NODE_MODULES_PATH) {
-		NODE_MODULES_PATH = path.join(__dirname, '../node_modules');
-	}
-
+	const NODE_MODULES_PATH = path.join(__dirname, '../node_modules');
 	const NODE_MODULES_ASAR_PATH = NODE_MODULES_PATH + '.asar';
 
 	const originalResolveLookupPaths = Module._resolveLookupPaths;
