Fix windows wrappers not actually updating

theotherp · May 12, 2024 · 8d2a09a · 8d2a09a
1 parent 2942199
commit 8d2a09a
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 4 deletions.
diff --git a/core/src/main/resources/changelog.yaml b/core/src/main/resources/changelog.yaml
@@ -1,6 +1,8 @@
 #@formatter:off
 -   version: "v6.2.1"
     changes:
+      -   type: "fix"
+          text: "Unfortunately the automatic update is broken with the new wrappers introduced in 6.0.0. And I tested it so thoroughly (I thought). NZBHydra would shut down for an update but not actually update, with automatic updates resulting in a loop :-("
       -   type: "fix"
           text: "Days without a buggy release: 0. Fix invalid link returned from DETAILS function. See #943"
       -   type: "fix"

diff --git a/other/gowrapper/base/base.go b/other/gowrapper/base/base.go
@@ -185,7 +185,8 @@ func doUpdate() {
 	LogFatalIfError(err)
 
 	for _, f := range r.File {
-		if strings.ToLower(f.Name) != "nzbhydra2" && !strings.HasSuffix(strings.ToLower(f.Name), ".exe") && strings.ToLower(f.Name) != "core.exe" {
+		//Do not update the wrapper executables
+		if !strings.HasSuffix(strings.ToLower(f.Name), ".exe") || strings.ToLower(f.Name) == "core.exe" {
 			if f.FileInfo().IsDir() {
 				continue
 			}

diff --git a/other/gowrapper/base/logger.go b/other/gowrapper/base/logger.go
@@ -65,5 +65,7 @@ func setupLogger() {
 	}
 	fileLogger.ExitFunc = Exit
 	consoleLogger.ExitFunc = Exit
+	fileLogger.Level = logrus.DebugLevel
+	consoleLogger.Level = logrus.InfoLevel
 
 }
diff --git a/releases/windows-release/include/NZBHydra2 Console.exe b/releases/windows-release/include/NZBHydra2 Console.exe
diff --git a/releases/windows-release/include/NZBHydra2.exe b/releases/windows-release/include/NZBHydra2.exe