github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-01-22 21:38:10 -05:00
Code Issues Packages Projects Releases Wiki Activity

Only display one dialog on successful installation.

Browse Source
This commit is contained in:
probablycorey
2014-01-22 16:01:52 -08:00
parent ca8609c925
commit 020326ffad
1 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/workspace-view.coffee
View File

@@ -135,23 +135,24 @@ class WorkspaceView extends View
@command 'core:save-as', => @saveActivePaneItemAs()
installShellCommands: ->
showDialog = (error, commandName)->
if error?
installDirectory = CommandInstaller.getInstallDirectory()
atom.confirm
message: error.message
detailedMessage: "Make sure #{CommandInstaller.getInstallDirectory()} exists and is writable. Run 'sudo mkdir -p #{installDirectory} && sudo chown $USER #{installDirectory}' to fix this problem."
else
atom.confirm
message: "Command installed."
detailedMessage: "The shell command `#{commandName}` is installed."
showErrorDialog = (error) ->
installDirectory = CommandInstaller.getInstallDirectory()
atom.confirm
message: error.message
detailedMessage: "Make sure #{installDirectory} exists and is writable. Run 'sudo mkdir -p #{installDirectory} && sudo chown $USER #{installDirectory}' to fix this problem."
resourcePath = atom.getLoadSettings().resourcePath
CommandInstaller.installAtomCommand resourcePath, (error) =>
showDialog(error, 'atom')
unless error?
if error?
showDialog(error)
else
CommandInstaller.installApmCommand resourcePath, (error) =>
showDialog(error, 'apm')
if error?
showDialog(error)
else
atom.confirm
message: "Commands installed."
detailedMessage: "The shell commands `atom` and `apm` are installed."
# Private:
handleFocus: (e) ->