diff options
Diffstat (limited to 'wrapper-remove-base-path-checks.patch')
| -rw-r--r-- | wrapper-remove-base-path-checks.patch | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/wrapper-remove-base-path-checks.patch b/wrapper-remove-base-path-checks.patch new file mode 100644 index 000000000000..6edf526dd8e0 --- /dev/null +++ b/wrapper-remove-base-path-checks.patch @@ -0,0 +1,30 @@ +diff --git a/other/wrapper/nzbhydra2wrapperPy3.py b/other/wrapper/nzbhydra2wrapperPy3.py +index e64c80d4..a9d8843c 100644 +--- a/other/wrapper/nzbhydra2wrapperPy3.py ++++ b/other/wrapper/nzbhydra2wrapperPy3.py +@@ -304,11 +304,6 @@ def startup(): + global jarFile, process, args, unknownArgs, consoleLines + basePath = getBasePath() + +- readme = os.path.join(basePath, "readme.md") +- if not os.path.exists(readme): +- logger.critical("Unable to determine base path correctly. Please make sure to run NZBHydra in the folder where its binary is located. Current base path: " + basePath) +- sys.exit(-1) +- + releaseType = determineReleaseType() + isWindows = platform.system().lower() == "windows" + isWithTrayIcon = os.path.exists("isWindowsTrayMarkerFile") +@@ -332,12 +327,8 @@ def startup(): + console_logger.setLevel("DEBUG") + logger.info("Setting wrapper log level to DEBUG") + +- libFolder = os.path.join(basePath, "lib") ++ libFolder = basePath + if releaseType == ReleaseType.GENERIC: +- if not os.path.exists(libFolder): +- logger.critical("Error: Lib folder %s not found. An update might've failed or the installation folder is corrupt", libFolder) +- sys.exit(-1) +- + jarFiles = [os.path.join(libFolder, f) for f in os.listdir(libFolder) if os.path.isfile(os.path.join(libFolder, f)) and f.endswith(".jar")] + if len(jarFiles) == 0: + logger.critical("Error: No JAR files found in folder %s. An update might've failed or the installation folder is corrupt", libFolder) |