Foundry376/Mailspring
1
1
Fork 0
mirror of https://github.com/Foundry376/Mailspring.git synced 2024-09-22 08:16:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #726 from daveperdue/patch-1

Browse source 
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
parent 504d052227 5d0e0201bb
commit 57651300ac
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
build/resources/linux/nylas.desktop.in
View file

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

4
build/tasks/install-task.coffee
View file

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