Explicitly set python exec and ignore errors from run from source blocks in main

This commit is contained in:
Veronica Berglyd Olsen
2024-04-20 21:31:04 +02:00
parent c2f0d04a35
commit e8bd9b21b5
2 changed files with 6 additions and 9 deletions
+5 -8
View File
@@ -32,7 +32,7 @@ from typing import TYPE_CHECKING
from PyQt5.QtWidgets import QApplication, QErrorMessage
from novelwriter.config import Config
from novelwriter.error import exceptionHandler, logException
from novelwriter.error import exceptionHandler
from novelwriter.shared import SharedData
if TYPE_CHECKING: # pragma: no cover
@@ -198,24 +198,21 @@ def main(sysArgs: list | None = None) -> GuiMain | None:
# Finish initialising config
CONFIG.initConfig(confPath, dataPath)
if CONFIG.osDarwin:
if sys.platform == "darwin":
try:
from Foundation import NSBundle # type: ignore
bundle = NSBundle.mainBundle()
info = bundle.localizedInfoDictionary() or bundle.infoDictionary()
info["CFBundleName"] = "novelWriter"
except Exception:
logger.error("Failed to set application name")
logException()
elif CONFIG.osWindows:
pass # Quietly ignore error
elif sys.platform == "win32":
try:
import ctypes
appID = f"io.novelwriter.{__version__}"
ctypes.windll.shell32.SetCurrentProcessExplicitAppUserModelID(appID) # type: ignore
except Exception:
logger.error("Failed to set application name")
logException()
pass # Quietly ignore error
# Import GUI (after dependency checks), and launch
from novelwriter.guimain import GuiMain
+1 -1
View File
@@ -139,7 +139,7 @@ echo "Creating entry script ..."
cat > novelWriter.app/Contents/MacOS/novelWriter << EOF
#!/bin/bash
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
$DIR/../Resources/bin/python -sE $DIR/../Resources/novelWriter/novelWriter.py \$@
$DIR/../Resources/bin/python$PYTHON -sE $DIR/../Resources/novelWriter/novelWriter.py \$@
EOF
# Make it executable