Foundry376/Mailspring
1
1
Fork 0
mirror of https://github.com/Foundry376/Mailspring.git synced 2024-09-22 00:06:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(squirrel): remove apm from path

Browse source
This commit is contained in:
Evan Morikawa 2016-01-12 18:36:44 -05:00
parent ef8759dd62
commit 2f5a4f93bf
1 changed files with 3 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/browser/squirrel-update.coffee
View file

@ -95,7 +95,7 @@ getPath = (callback) ->
else
callback(new Error('Registry query for PATH failed'))
# Add atom and apm to the PATH
# Add N1 to the PATH
#
# This is done by adding .cmd shims to the root bin folder in the N1
# install directory that point to the newly installed versions inside
@ -110,19 +110,9 @@ addCommandsToPath = (callback) ->
relativeN1ShPath = path.relative(binFolder, path.join(appFolder, 'resources', 'cli', 'N1.sh'))
nylasShCommand = "#!/bin/sh\r\n\"$(dirname \"$0\")/#{relativeN1ShPath.replace(/\\/g, '/')}\" \"$@\""
apmCommandPath = path.join(binFolder, 'apm.cmd')
relativeApmPath = path.relative(binFolder, path.join(process.resourcesPath, 'app', 'apm', 'bin', 'apm.cmd'))
apmCommand = "@echo off\r\n\"%~dp0\\#{relativeApmPath}\" %*"
apmShCommandPath = path.join(binFolder, 'apm')
relativeApmShPath = path.relative(binFolder, path.join(appFolder, 'resources', 'cli', 'apm.sh'))
apmShCommand = "#!/bin/sh\r\n\"$(dirname \"$0\")/#{relativeApmShPath.replace(/\\/g, '/')}\" \"$@\""
fs.writeFile nylasCommandPath, nylasCommand, ->
fs.writeFile nylasShCommandPath, nylasShCommand, ->
fs.writeFile apmCommandPath, apmCommand, ->
fs.writeFile apmShCommandPath, apmShCommand, ->
callback()
callback()
addBinToPath = (pathSegments, callback) ->
pathSegments.push(binFolder)
@ -141,7 +131,7 @@ addCommandsToPath = (callback) ->
else
callback()
# Remove N1 and apm from the PATH
# Remove N1 from the PATH
removeCommandsFromPath = (callback) ->
getPath (error, pathEnv) ->
return callback(error) if error?