From c46a38362fde2a276bba59e54d446cbd3bb56e05 Mon Sep 17 00:00:00 2001 From: mbilker Date: Fri, 27 Nov 2015 14:41:53 -0500 Subject: [PATCH 1/3] fix(fedora-spec): copy nylas icons into hicolor folder --- build/resources/linux/redhat/nylas.spec.in | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/build/resources/linux/redhat/nylas.spec.in b/build/resources/linux/redhat/nylas.spec.in index 4e39efe7e..5fe8648f2 100644 --- a/build/resources/linux/redhat/nylas.spec.in +++ b/build/resources/linux/redhat/nylas.spec.in @@ -12,15 +12,30 @@ AutoReqProv: no # Avoid libchromiumcontent.so missing dependency %install mkdir -p %{buildroot}/usr/local/share/nylas cp -r /tmp/nylas-build/Nylas/* %{buildroot}/usr/local/share/nylas + mkdir -p %{buildroot}/usr/local/bin/ ln -sf /usr/local/share/nylas/resources/app/apm/node_modules/.bin/apm %{buildroot}/usr/local/bin/apm + cp N1.sh %{buildroot}/usr/local/bin/nylas -chmod 755 nylas +chmod 755 %{buildroot}/usr/local/bin/nylas + mkdir -p %{buildroot}/usr/local/share/applications/ mv nylas.desktop %{buildroot}/usr/local/share/applications/ +for s in 16 32 64 128 256 512; do + mkdir -p %{buildroot}/usr/local/share/icons/hicolor/${s}x${s}/apps + cp -p /tmp/nylas-build/icons/${s}.png \ + %{buildroot}/usr/local/share/icons/hicolor/${s}x${s}/apps/nylas.png +done + %files /usr/local/bin/nylas /usr/local/bin/apm /usr/local/share/nylas/ /usr/local/share/applications/nylas.desktop +/usr/local/share/icons/hicolor/16x16/apps/nylas.png +/usr/local/share/icons/hicolor/32x32/apps/nylas.png +/usr/local/share/icons/hicolor/64x64/apps/nylas.png +/usr/local/share/icons/hicolor/128x128/apps/nylas.png +/usr/local/share/icons/hicolor/256x256/apps/nylas.png +/usr/local/share/icons/hicolor/512x512/apps/nylas.png From e32d52ff3d0d09e451e7040ac6c3ee4d028a8e00 Mon Sep 17 00:00:00 2001 From: mbilker Date: Fri, 27 Nov 2015 15:18:46 -0500 Subject: [PATCH 2/3] fix(grunt): update location of rpm icon name --- build/tasks/mkrpm-task.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/tasks/mkrpm-task.coffee b/build/tasks/mkrpm-task.coffee index 6846dba24..d26fb6bd3 100644 --- a/build/tasks/mkrpm-task.coffee +++ b/build/tasks/mkrpm-task.coffee @@ -32,7 +32,7 @@ module.exports = (grunt) -> installDir = grunt.config.get('nylasGruntConfig.installDir') shareDir = path.join(installDir, 'share', 'nylas') - iconName = path.join(shareDir, 'resources', 'app', 'resources', 'nylas.png') + iconName = 'nylas' data = {name, version, description, installDir, iconName} specFilePath = fillTemplate(path.join('build', 'resources', 'linux', 'redhat', 'nylas.spec'), data) From e3460a7a9b6661bf74ca82ba87d29a28a2ccaca1 Mon Sep 17 00:00:00 2001 From: mbilker Date: Fri, 27 Nov 2015 16:15:13 -0500 Subject: [PATCH 3/3] fix(redhat-spec): copy 512x512 icon to /usr/local/share/nylas/resources/app/nylas.png The icon build/resources/nylas.png is exactly the same as build/resources/linux/icons/512.png Not confident that the spec script is run from base N1 directory to use the nylas.png in the spec file --- build/resources/linux/redhat/nylas.spec.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build/resources/linux/redhat/nylas.spec.in b/build/resources/linux/redhat/nylas.spec.in index 5fe8648f2..4e526b450 100644 --- a/build/resources/linux/redhat/nylas.spec.in +++ b/build/resources/linux/redhat/nylas.spec.in @@ -22,6 +22,8 @@ chmod 755 %{buildroot}/usr/local/bin/nylas mkdir -p %{buildroot}/usr/local/share/applications/ mv nylas.desktop %{buildroot}/usr/local/share/applications/ +cp /tmp/nylas-build/icons/512.png %{buildroot}/usr/local/share/nylas/resources/app/nylas.png + for s in 16 32 64 128 256 512; do mkdir -p %{buildroot}/usr/local/share/icons/hicolor/${s}x${s}/apps cp -p /tmp/nylas-build/icons/${s}.png \