Let Linux packages fully determine executable path
It is no longer hard coded into the atom.desktop.in file; the individual grunt tasks now determine how the executable is accessed.
Esse commit está contido em:
@@ -36,8 +36,9 @@ module.exports = (grunt) ->
|
|||||||
maintainer = 'GitHub <atom@github.com>'
|
maintainer = 'GitHub <atom@github.com>'
|
||||||
installDir = '/usr'
|
installDir = '/usr'
|
||||||
iconName = 'atom'
|
iconName = 'atom'
|
||||||
|
executable = path.join(installDir, 'share', 'atom', 'atom')
|
||||||
getInstalledSize buildDir, (error, installedSize) ->
|
getInstalledSize buildDir, (error, installedSize) ->
|
||||||
data = {name, version, description, section, arch, maintainer, installDir, iconName, installedSize}
|
data = {name, version, description, section, arch, maintainer, installDir, iconName, installedSize, executable}
|
||||||
controlFilePath = fillTemplate(path.join('resources', 'linux', 'debian', 'control'), data)
|
controlFilePath = fillTemplate(path.join('resources', 'linux', 'debian', 'control'), data)
|
||||||
desktopFilePath = fillTemplate(path.join('resources', 'linux', 'atom.desktop'), data)
|
desktopFilePath = fillTemplate(path.join('resources', 'linux', 'atom.desktop'), data)
|
||||||
icon = path.join('resources', 'atom.png')
|
icon = path.join('resources', 'atom.png')
|
||||||
|
|||||||
@@ -33,8 +33,9 @@ module.exports = (grunt) ->
|
|||||||
installDir = grunt.config.get('atom.installDir')
|
installDir = grunt.config.get('atom.installDir')
|
||||||
shareDir = path.join(installDir, 'share', 'atom')
|
shareDir = path.join(installDir, 'share', 'atom')
|
||||||
iconName = path.join(shareDir, 'resources', 'app', 'resources', 'atom.png')
|
iconName = path.join(shareDir, 'resources', 'app', 'resources', 'atom.png')
|
||||||
|
executable = path.join(shareDir, 'atom')
|
||||||
|
|
||||||
data = {name, version, description, installDir, iconName}
|
data = {name, version, description, installDir, iconName, executable}
|
||||||
specFilePath = fillTemplate(path.join('resources', 'linux', 'redhat', 'atom.spec'), data)
|
specFilePath = fillTemplate(path.join('resources', 'linux', 'redhat', 'atom.spec'), data)
|
||||||
desktopFilePath = fillTemplate(path.join('resources', 'linux', 'atom.desktop'), data)
|
desktopFilePath = fillTemplate(path.join('resources', 'linux', 'atom.desktop'), data)
|
||||||
|
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
Name=Atom
|
Name=Atom
|
||||||
Comment=<%= description %>
|
Comment=<%= description %>
|
||||||
GenericName=Text Editor
|
GenericName=Text Editor
|
||||||
Exec=<%= installDir %>/share/atom/atom %U
|
Exec=<%= executable %> %U
|
||||||
Icon=<%= iconName %>
|
Icon=<%= iconName %>
|
||||||
Type=Application
|
Type=Application
|
||||||
StartupNotify=true
|
StartupNotify=true
|
||||||
|
|||||||
Referência em uma Nova Issue
Bloquear um usuário