github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-01-25 14:59:03 -05:00
Code Issues Packages Projects Releases Wiki Activity

Update path to apm in squirrel-update and package-manager

Browse Source
This commit is contained in:
Cheng Zhao
2015-03-26 17:51:26 +08:00
parent c52058ef12
commit 685e4ebe96
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/browser/squirrel-update.coffee
View File

@@ -142,7 +142,7 @@ addCommandsToPath = (callback) ->
atomShCommand = "#!/bin/sh\r\n\"$0/../#{relativeAtomShPath.replace(/\\/g, '/')}\" \"$@\""
apmCommandPath = path.join(binFolder, 'apm.cmd')
relativeApmPath = path.relative(binFolder, path.join(process.resourcesPath, 'app', 'apm', 'bin', 'apm.cmd'))
relativeApmPath = path.relative(binFolder, path.join(process.resourcesPath, 'apm', 'bin', 'apm.cmd'))
apmCommand = "@echo off\r\n\"%~dp0\\#{relativeApmPath}\" %*"
apmShCommandPath = path.join(binFolder, 'apm')

2
src/package-manager.coffee
View File

@@ -134,7 +134,7 @@ class PackageManager
commandName = 'apm'
commandName += '.cmd' if process.platform is 'win32'
apmRoot = path.resolve(__dirname, '..', 'apm')
apmRoot = path.resolve(__dirname, '..', '..', 'apm')
@apmPath = path.join(apmRoot, 'bin', commandName)
unless fs.isFileSync(@apmPath)
@apmPath = path.join(apmRoot, 'node_modules', 'atom-package-manager', 'bin', commandName)