github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-02-12 15:45:23 -05:00
Code Issues Packages Projects Releases Wiki Activity

Remove check for /usr/local/bin

Browse Source
This commit is contained in:
probablycorey
2014-02-13 08:40:48 -08:00
parent a78dff15c4
commit 1f47e7ae64
1 changed files with 15 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/command-installer.coffee
View File

@@ -39,27 +39,23 @@ module.exports =
commandName = path.basename(commandPath, path.extname(commandPath))
directory = @getInstallDirectory()
if fs.existsSync(directory)
destinationPath = path.join(directory, commandName)
unlinkCommand destinationPath, (error) =>
# Retry with privilige escalation.
if error?.code is 'EACCES' and unlinkCommandWithPrivilegeSync(destinationPath)
error = null
destinationPath = path.join(directory, commandName)
unlinkCommand destinationPath, (error) =>
# Retry with privilige escalation.
if error?.code is 'EACCES' and unlinkCommandWithPrivilegeSync(destinationPath)
error = null
if error?
error = new Error "Could not remove file at #{destinationPath}."
if error?
error = new Error "Could not remove file at #{destinationPath}."
callback?(error)
else
symlinkCommand commandPath, destinationPath, (error) =>
# Retry with privilige escalation.
if error?.code is 'EACCES' and symlinkCommandWithPrivilegeSync(commandPath, destinationPath)
error = null
error = new Error "Failed to symlink #{commandPath} to #{destinationPath}." if error?
callback?(error)
else
symlinkCommand commandPath, destinationPath, (error) =>
# Retry with privilige escalation.
if error?.code is 'EACCES' and symlinkCommandWithPrivilegeSync(commandPath, destinationPath)
error = null
error = new Error "Failed to symlink #{commandPath} to #{destinationPath}." if error?
callback?(error)
else
error = new Error "Directory '#{directory} doesn't exist."
callback?(error)
installAtomCommand: (resourcePath, callback) ->
commandPath = path.join(resourcePath, 'atom.sh')