From a6285bc4e90e442906bc86542f885f79e2dea15e Mon Sep 17 00:00:00 2001 From: Antonio Scandurra Date: Tue, 15 Aug 2017 19:01:07 +0200 Subject: [PATCH 1/2] Revert "Stop using asar archives" --- src/apm.coffee | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/src/apm.coffee b/src/apm.coffee index 61f6857c2..a78afa3e2 100644 --- a/src/apm.coffee +++ b/src/apm.coffee @@ -26,24 +26,28 @@ module.exports = apmFolder = path.resolve(__dirname, '..') appFolder = path.dirname(apmFolder) - if path.basename(apmFolder) is 'apm' and path.basename(appFolder) is 'app' and fs.existsSync(appFolder) - return process.nextTick -> callback(appFolder) + if path.basename(apmFolder) is 'apm' and path.basename(appFolder) is 'app' + asarPath = "#{appFolder}.asar" + if fs.existsSync(asarPath) + return process.nextTick -> callback(asarPath) apmFolder = path.resolve(__dirname, '..', '..', '..') appFolder = path.dirname(apmFolder) - if path.basename(apmFolder) is 'apm' and path.basename(appFolder) is 'app' and fs.existsSync(appFolder) - return process.nextTick -> callback(appFolder) + if path.basename(apmFolder) is 'apm' and path.basename(appFolder) is 'app' + asarPath = "#{appFolder}.asar" + if fs.existsSync(asarPath) + return process.nextTick -> callback(asarPath) switch process.platform when 'darwin' child_process.exec 'mdfind "kMDItemCFBundleIdentifier == \'com.github.atom\'"', (error, stdout='', stderr) -> [appLocation] = stdout.split('\n') unless error appLocation = '/Applications/Atom.app' unless appLocation - callback("#{appLocation}/Contents/Resources/app") + callback("#{appLocation}/Contents/Resources/app.asar") when 'linux' - appLocation = '/usr/local/share/atom/resources/app' + appLocation = '/usr/local/share/atom/resources/app.asar' unless fs.existsSync(appLocation) - appLocation = '/usr/share/atom/resources/app' + appLocation = '/usr/share/atom/resources/app.asar' process.nextTick -> callback(appLocation) getReposDirectory: -> From 3a0dec420e8280dd866a9edd3158e2f88c1b883d Mon Sep 17 00:00:00 2001 From: Antonio Scandurra Date: Tue, 15 Aug 2017 19:03:52 +0200 Subject: [PATCH 2/2] 1.18.4-0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index a484be416..a00a08e51 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "atom-package-manager", "description": "Atom package manager", - "version": "1.18.3", + "version": "1.18.4-0", "license": "MIT", "repository": { "type": "git",