Fix a couple of setup issues and add a note to the docs about updating python
This commit is contained in:
@@ -69,6 +69,10 @@ Open the folder where you extracted the novelWriter source, and double-click the
|
|||||||
setup script to install dependencies, and desktop and start menu icons. It will also check that it
|
setup script to install dependencies, and desktop and start menu icons. It will also check that it
|
||||||
can find Python from Step 1.
|
can find Python from Step 1.
|
||||||
|
|
||||||
|
.. note::
|
||||||
|
If you upgrade Python to a newer version and the path to ``pythonw.exe`` changes, you may need
|
||||||
|
to run this script again.
|
||||||
|
|
||||||
**Alternative B: Manual Installation**
|
**Alternative B: Manual Installation**
|
||||||
|
|
||||||
The above alternative can also be run manually.
|
The above alternative can also be run manually.
|
||||||
|
|||||||
@@ -686,7 +686,7 @@ def winInstall():
|
|||||||
"""Will attempt to install icons and make a launcher for Windows.
|
"""Will attempt to install icons and make a launcher for Windows.
|
||||||
"""
|
"""
|
||||||
import winreg
|
import winreg
|
||||||
from nw import __version__, __hexversion__
|
from nw import __version__, __status__
|
||||||
try:
|
try:
|
||||||
import win32com.client
|
import win32com.client
|
||||||
except ImportError:
|
except ImportError:
|
||||||
@@ -702,7 +702,7 @@ def winInstall():
|
|||||||
print("===============")
|
print("===============")
|
||||||
print("")
|
print("")
|
||||||
|
|
||||||
nwTesting = not __hexversion__.endswith("f0")
|
nwTesting = not __status__.lower().startswith("stable")
|
||||||
wShell = win32com.client.Dispatch("WScript.Shell")
|
wShell = win32com.client.Dispatch("WScript.Shell")
|
||||||
|
|
||||||
if nwTesting:
|
if nwTesting:
|
||||||
@@ -780,7 +780,7 @@ def winInstall():
|
|||||||
winreg.SetValueEx(regKey, kName, 0, winreg.REG_SZ, kVal)
|
winreg.SetValueEx(regKey, kName, 0, winreg.REG_SZ, kVal)
|
||||||
winreg.CloseKey(regKey)
|
winreg.CloseKey(regKey)
|
||||||
|
|
||||||
mimeIcon = os.path.join(targetDir, "assets", "icons", "x-novelwriter-project.ico")
|
mimeIcon = os.path.join(targetDir, "nw", "assets", "icons", "x-novelwriter-project.ico")
|
||||||
mimeExec = '"%s" "%s" "%%1"' % (pythonExe, targetPy)
|
mimeExec = '"%s" "%s" "%%1"' % (pythonExe, targetPy)
|
||||||
|
|
||||||
try:
|
try:
|
||||||
|
|||||||
Reference in New Issue
Block a user