Merge pull request #479 from vkbo/gnome_setup

Gnome Setup

MANIFEST.in

@@ -1,4 +1,4 @@
 include LICENSE.md
-recursive-include assets *
+recursive-include setup *
 recursive-include nw/assets *
 recursive-include sample *.nwx *.nwd

README.md

@@ -12,7 +12,7 @@
 [![pypi](https://img.shields.io/pypi/v/novelwriter)](https://pypi.org/project/novelWriter)
 [![python](https://img.shields.io/pypi/pyversions/novelwriter)](https://pypi.org/project/novelWriter)
 
-<img align="left" style="margin: 0 16px 4px 0;" src="https://raw.githubusercontent.com/vkbo/novelWriter/main/assets/icons/96x96/novelwriter.png">
+<img align="left" style="margin: 0 16px 4px 0;" src="https://raw.githubusercontent.com/vkbo/novelWriter/main/setup/icons/96x96/novelwriter.png">
 
 novelWriter is a Markdown-like text editor designed for writing novels and larger projects of many
 smaller plain text documents. It uses its own flavour of Markdown that supports a meta data syntax
@@ -81,7 +81,7 @@ You can also provide a path to a folder containing a novelWriter project as the
 
 ### Launcher and Icons
 
-In the root assets folder there are icons and scripts and a template for setting up a launcher on
+In the root setup folder there are icons and scripts and a template for setting up a launcher on
 Gnome desktops. You may need to modify those scripts slightly, but as they are, they work on Debian
 and Ubuntu. For other operating systems, please consult your operating system documentation for how
 to make those. Feel free to submit more if you are able to make them.

assets/installDebian.sh

@@ -1,49 +0,0 @@
-#!/bin/bash
-
-cd ..
-
-EXEC=$(pwd)/novelWriter.py
-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/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/
-
-update-mime-database /usr/share/mime/
-update-icon-caches /usr/share/icons/hicolor/24x24/apps/
-update-icon-caches /usr/share/icons/hicolor/48x48/apps/
-update-icon-caches /usr/share/icons/hicolor/96x96/apps/
-update-icon-caches /usr/share/icons/hicolor/256x256/apps/
-update-icon-caches /usr/share/icons/hicolor/512x512/apps/
-update-icon-caches /usr/share/icons/hicolor/1024x1024/apps/
-update-icon-caches /usr/share/icons/hicolor/scalable/apps/
-update-icon-caches /usr/share/icons/hicolor/scalable/mimetypes/

docs/source/int_started.rst

@@ -140,7 +140,7 @@ encountered. To list all options, run:
 
    python novelWriter.py --help
 
-There are also a couple of install scripts in the assets folder which will assist in setting up a
+There are also a couple of install scripts in the setup folder which will assist in setting up a
 launch icon and the novelWriter project file mimetype for Gnome desktops on Linux. Currently,
 there's one script for Debian and one for Ubuntu.
 

setup/installDebianUbuntu.sh

@@ -5,7 +5,7 @@ cd ..
 EXEC=$(pwd)/novelWriter.py
 EXEC=$(echo $EXEC | sed 's_/_\\/_g')
 
-sed "s/%%exec%%/$EXEC/g" assets/novelwriter.desktop > /usr/share/applications/novelwriter.desktop
+sed "s/%%exec%%/$EXEC/g" setup/novelwriter.desktop > /usr/share/applications/novelwriter.desktop
 
 if [ ! -d /usr/share/icons/hicolor/24x24/apps ]; then
     mkdir -pv /usr/share/icons/hicolor/24x24/apps
@@ -29,14 +29,14 @@ 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 setup/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 setup/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 setup/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 setup/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 setup/icons/512x512/novelwriter.png   /usr/share/icons/hicolor/512x512/apps/
-cp -v assets/icons/novelwriter.svg           /usr/share/icons/hicolor/scalable/apps/
+cp -v setup/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 setup/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/
+cp -v setup/mime/x-novelwriter-project.xml  /usr/share/mime/packages/
 
 update-mime-database /usr/share/mime/
 update-icon-caches /usr/share/icons/*

setup/mime/x-novelwriter-project.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
   <mime-type type="application/x-novelwriter-project">
-    <comment>novelWriter Project </comment>
+    <comment>novelWriter Project</comment>
     <sub-class-of type="application/xml"/>
     <glob pattern="*.nwx"/>
   </mime-type>