Merge pull request #726 from daveperdue/patch-1

Fix broken icon from issue #465 and Fix icon path for install
This commit is contained in:
Juan 2015-12-20 13:45:45 -08:00
commit 57651300ac
2 changed files with 3 additions and 2 deletions

View file

@ -6,5 +6,6 @@ Exec=<%= installDir %>/share/nylas/nylas %U
Icon=<%= iconName %>
Type=Application
StartupNotify=true
StartupWMClass=Nylas N1
Categories=GNOME;GTK;Utility;EmailClient;Development;
MimeType=text/plain;x-scheme-handler/mailto;x-scheme-handler/nylas;

View file

@ -33,7 +33,7 @@ module.exports = (grunt) ->
else
binDir = path.join(installDir, 'bin')
shareDir = path.join(installDir, 'share', 'nylas')
iconName = path.join(shareDir, 'resources', 'app', 'resources', 'nylas.png')
iconName = path.join(shareDir, 'resources', 'app', 'nylas.png')
mkdir binDir
# Note that `N1.sh` can't be renamed `nylas.sh` because `apm`
@ -50,7 +50,7 @@ module.exports = (grunt) ->
desktopInstallFile = path.join(installDir, 'share', 'applications', 'nylas.desktop')
{description} = grunt.file.readJSON('package.json')
iconName = path.join(shareDir, 'resources', 'app', 'resources', 'nylas.png')
iconName = path.join(shareDir, 'resources', 'app', 'nylas.png')
installDir = path.join(installDir, '.') # To prevent "Exec=/usr/local//share/nylas/nylas"
template = _.template(String(fs.readFileSync(desktopFile)))
filled = template({description, installDir, iconName})