From c73543216320624f8f648fa39d026ba8bb2bd294 Mon Sep 17 00:00:00 2001 From: Fabian Stiewitz Date: Wed, 18 Jun 2014 20:07:29 +0200 Subject: [PATCH 1/2] Install with respect to INSTALL_PREFIX --- build/tasks/install-task.coffee | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/build/tasks/install-task.coffee b/build/tasks/install-task.coffee index 925a6eff2..9077d6d8b 100644 --- a/build/tasks/install-task.coffee +++ b/build/tasks/install-task.coffee @@ -40,13 +40,14 @@ module.exports = (grunt) -> mkdir path.dirname(shareDir) cp shellAppDir, shareDir - # Create Atom.desktop if installation in '/usr/local' - applicationsDir = path.join('/usr','share','applications') + # Create Atom.desktop if installation not in temporary folder tmpDir = if process.env.TMPDIR? then process.env.TMPDIR else '/tmp' - if installDir.indexOf(tmpDir) isnt 0 and fs.isDirectorySync(applicationsDir) + desktopInstallFile = path.join(installDir,'share','applications','Atom.desktop') + if installDir.indexOf(tmpDir) isnt 0 + mkdir path.dirname(desktopInstallFile) {description} = grunt.file.readJSON('package.json') fillTemplate(desktopFile, {description, installDir, iconName}) - cp desktopFile, path.join(applicationsDir,'Atom.desktop') + cp desktopFile, desktopInstallFile # Create relative symbol link for apm. process.chdir(binDir) From 87aae13c80eb8870049f0087620179a13296195f Mon Sep 17 00:00:00 2001 From: Fabian Stiewitz Date: Wed, 18 Jun 2014 20:28:38 +0200 Subject: [PATCH 2/2] Prevent double slash in Atom.desktop --- build/tasks/install-task.coffee | 1 + 1 file changed, 1 insertion(+) diff --git a/build/tasks/install-task.coffee b/build/tasks/install-task.coffee index 9077d6d8b..d3a3aa010 100644 --- a/build/tasks/install-task.coffee +++ b/build/tasks/install-task.coffee @@ -46,6 +46,7 @@ module.exports = (grunt) -> if installDir.indexOf(tmpDir) isnt 0 mkdir path.dirname(desktopInstallFile) {description} = grunt.file.readJSON('package.json') + installDir = path.join(installDir,'.') # To prevent "Exec=/usr/local//share/atom/atom" fillTemplate(desktopFile, {description, installDir, iconName}) cp desktopFile, desktopInstallFile