From 295351d3e93688ab3d3bdcb52cce17f52e2fc7ee Mon Sep 17 00:00:00 2001
From: "Veronica K. B. Olsen" <1619840+vkbo@users.noreply.github.com>
Date: Wed, 3 Feb 2021 20:33:32 +0100
Subject: [PATCH] Fix a few issues with the minimal zip file and update README

---
 README.md         | 12 +++++++++---
 setup.py          |  3 ++-
 setup_windows.bat |  3 ---
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index 033035fa..75530f74 100644
--- a/README.md
+++ b/README.md
@@ -191,9 +191,15 @@ novelWriter
 
 ### Setup on Windows
 
-For Windows, you can either install via PyPi, or use the Windows installer available from the
-[releases](https://github.com/vkbo/novelWriter/releases) page. This should add the necessary icons
-to your desktop and start menu.
+For Windows, first ensure that you have Python installed. If not, get it from
+[python.org/downloads](https://www.python.org/downloads/). Remember to select "Add Python to PATH"
+during the installation, otherwise novelWriter cannot find it.
+
+Then, download the `novelWriter-x.y.z-minimal.zip` file, where `x.y.z` is the version number, from
+the [releases](https://github.com/vkbo/novelWriter/releases) page. You can extract it to wherever
+you want to keep novelWriter on your PC, and run the `setup_windows.bat` file in it
+(double-clicking it should work). This will install the necessary dependencies from
+[pypi,org](https://pypi.org/) and create desktop and start menu icons.
 
 
 ## Debugging
diff --git a/setup.py b/setup.py
index 41046a4c..c43ccfd7 100755
--- a/setup.py
+++ b/setup.py
@@ -264,6 +264,7 @@ def makeMinimalPackage():
         "LICENSE.md",
         "README.md",
         "novelWriter.pyw",
+        "requirements.txt",
         "setup.py",
         "setup_windows.bat",
     ]
@@ -784,7 +785,7 @@ def winInstall():
 
     targetDir = os.path.abspath(os.path.dirname(__file__))
     targetPy = os.path.join(targetDir, "novelWriter.pyw")
-    targetIcon = os.path.join(targetDir, "setup", "icons", "novelwriter.ico")
+    targetIcon = os.path.join(targetDir, "nw", "assets", "icons", "novelwriter.ico")
 
     print("Collecting Info ...")
     print("Desktop Folder:    %s" % desktopDir)
diff --git a/setup_windows.bat b/setup_windows.bat
index c912508f..12a8cc3f 100644
--- a/setup_windows.bat
+++ b/setup_windows.bat
@@ -8,9 +8,6 @@ if errorlevel 1 goto errorNoPython
 echo Python found. OK.
 echo.
 
-:: Generate the sample project
-python setup.py sample
-
 :: Install the PyQt5, lxml and pyenchant dependencies
 python setup.py pip