From fa08276dd5b26076932838d4ef08836fd872adc5 Mon Sep 17 00:00:00 2001 From: "Veronica K. B. Olsen" <1619840+vkbo@users.noreply.github.com> Date: Thu, 9 Jul 2020 12:23:39 +0200 Subject: [PATCH 1/3] Some fixed to the install scripts and launcher template --- assets/installDebian.sh | 23 ++++++++++++++++++++++- assets/installUbuntu.sh | 23 ++++++++++++++++++++++- assets/novelwriter.desktop | 2 +- 3 files changed, 45 insertions(+), 3 deletions(-) diff --git a/assets/installDebian.sh b/assets/installDebian.sh index c3e88ae9..3f5ae392 100755 --- a/assets/installDebian.sh +++ b/assets/installDebian.sh @@ -7,12 +7,33 @@ EXEC=$(echo $EXEC | sed 's_/_\\/_g') sed "s/%%exec%%/$EXEC/g" assets/novelwriter.desktop > /usr/share/applications/novelwriter.desktop +if [ ! -d /usr/share/icons/hicolor/24x24/apps ]; then + mkdir -pv /usr/share/icons/hicolor/24x24/apps +fi +if [ ! -d /usr/share/icons/hicolor/48x48/apps ]; then + mkdir -pv /usr/share/icons/hicolor/48x48/apps +fi +if [ ! -d /usr/share/icons/hicolor/96x96/apps ]; then + mkdir -pv /usr/share/icons/hicolor/96x96/apps +fi +if [ ! -d /usr/share/icons/hicolor/256x256/apps ]; then + mkdir -pv /usr/share/icons/hicolor/256x256/apps +fi +if [ ! -d /usr/share/icons/hicolor/512x512/apps ]; then + mkdir -pv /usr/share/icons/hicolor/512x512/apps +fi +if [ ! -d /usr/share/icons/hicolor/scalable/apps ]; then + mkdir -pv /usr/share/icons/hicolor/scalable/apps +fi +if [ ! -d /usr/share/icons/hicolor/scalable/mimetypes ]; then + mkdir -pv /usr/share/icons/hicolor/scalable/mimetypes +fi + cp -v assets/icons/24x24/novelwriter.png /usr/share/icons/hicolor/24x24/apps/ cp -v assets/icons/48x48/novelwriter.png /usr/share/icons/hicolor/48x48/apps/ cp -v assets/icons/96x96/novelwriter.png /usr/share/icons/hicolor/96x96/apps/ cp -v assets/icons/256x256/novelwriter.png /usr/share/icons/hicolor/256x256/apps/ cp -v assets/icons/512x512/novelwriter.png /usr/share/icons/hicolor/512x512/apps/ -cp -v assets/icons/1024x1024/novelwriter.png /usr/share/icons/hicolor/1024x1024/apps/ cp -v assets/icons/novelwriter.svg /usr/share/icons/hicolor/scalable/apps/ cp -v assets/icons/x-novelwriter-project.svg /usr/share/icons/hicolor/scalable/mimetypes/application-x-novelwriter-project.svg cp -v assets/mime/x-novelwriter-project.xml /usr/share/mime/packages/ diff --git a/assets/installUbuntu.sh b/assets/installUbuntu.sh index c42d33c3..91e78409 100755 --- a/assets/installUbuntu.sh +++ b/assets/installUbuntu.sh @@ -7,12 +7,33 @@ EXEC=$(echo $EXEC | sed 's_/_\\/_g') sed "s/%%exec%%/$EXEC/g" assets/novelwriter.desktop > /usr/share/applications/novelwriter.desktop +if [ ! -d /usr/share/icons/hicolor/24x24/apps ]; then + mkdir -pv /usr/share/icons/hicolor/24x24/apps +fi +if [ ! -d /usr/share/icons/hicolor/48x48/apps ]; then + mkdir -pv /usr/share/icons/hicolor/48x48/apps +fi +if [ ! -d /usr/share/icons/hicolor/96x96/apps ]; then + mkdir -pv /usr/share/icons/hicolor/96x96/apps +fi +if [ ! -d /usr/share/icons/hicolor/256x256/apps ]; then + mkdir -pv /usr/share/icons/hicolor/256x256/apps +fi +if [ ! -d /usr/share/icons/hicolor/512x512/apps ]; then + mkdir -pv /usr/share/icons/hicolor/512x512/apps +fi +if [ ! -d /usr/share/icons/hicolor/scalable/apps ]; then + mkdir -pv /usr/share/icons/hicolor/scalable/apps +fi +if [ ! -d /usr/share/icons/hicolor/scalable/mimetypes ]; then + mkdir -pv /usr/share/icons/hicolor/scalable/mimetypes +fi + cp -v assets/icons/24x24/novelwriter.png /usr/share/icons/hicolor/24x24/apps/ cp -v assets/icons/48x48/novelwriter.png /usr/share/icons/hicolor/48x48/apps/ cp -v assets/icons/96x96/novelwriter.png /usr/share/icons/hicolor/96x96/apps/ cp -v assets/icons/256x256/novelwriter.png /usr/share/icons/hicolor/256x256/apps/ cp -v assets/icons/512x512/novelwriter.png /usr/share/icons/hicolor/512x512/apps/ -#cp -v assets/icons/1024x1024/novelwriter.png /usr/share/icons/hicolor/1024x1024/apps/ cp -v assets/icons/novelwriter.svg /usr/share/icons/hicolor/scalable/apps/ cp -v assets/icons/x-novelwriter-project.svg /usr/share/icons/hicolor/scalable/mimetypes/application-x-novelwriter-project.svg cp -v assets/mime/x-novelwriter-project.xml /usr/share/mime/packages/ diff --git a/assets/novelwriter.desktop b/assets/novelwriter.desktop index 2e6901d3..865102d5 100644 --- a/assets/novelwriter.desktop +++ b/assets/novelwriter.desktop @@ -5,6 +5,6 @@ Name=novelWriter Comment=Multi-document markdown editor for novels Exec=%%exec%% %f Icon=novelwriter -Categories=GTK;GNOME;Office; +Categories=QT;GNOME;Office; Terminal=false MimeType=application/x-novelwriter-project From 0330b3a0b45c24f253837910b62aeaab116bbd46 Mon Sep 17 00:00:00 2001 From: "Veronica K. B. Olsen" <1619840+vkbo@users.noreply.github.com> Date: Fri, 10 Jul 2020 14:26:39 +0200 Subject: [PATCH 2/3] Added root folder assets to the manifest file --- MANIFEST.in | 1 + 1 file changed, 1 insertion(+) diff --git a/MANIFEST.in b/MANIFEST.in index a86d40d8..36a99646 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,3 +1,4 @@ include LICENSE.md +recursive-include assets * recursive-include nw/assets * recursive-include sample *.nwx *.nwd From 8d1938922d5edfe223518ec2c07a560182b82de7 Mon Sep 17 00:00:00 2001 From: "Veronica K. B. Olsen" <1619840+vkbo@users.noreply.github.com> Date: Fri, 10 Jul 2020 14:36:25 +0200 Subject: [PATCH 3/3] Set the correct categories for the .desktop file --- assets/novelwriter.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/novelwriter.desktop b/assets/novelwriter.desktop index 865102d5..69550600 100644 --- a/assets/novelwriter.desktop +++ b/assets/novelwriter.desktop @@ -5,6 +5,6 @@ Name=novelWriter Comment=Multi-document markdown editor for novels Exec=%%exec%% %f Icon=novelwriter -Categories=QT;GNOME;Office; +Categories=Qt;Office;WordProcessor; Terminal=false MimeType=application/x-novelwriter-project