Pull request: 5270-updater-package-url

Merge in DNS/adguard-home from 5270-updater-package-url to master Squashed commit of the following: commit 50ee8ed Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed Dec 28 12:21:24 2022 +0700 updater: package url
heyxkhoa · Mar 17, 2023 · ab795fc · ab795fc
1 parent e278ff8
commit ab795fc
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/internal/updater/check.go b/internal/updater/check.go
@@ -92,7 +92,11 @@ func (u *Updater) parseVersionResponse(data []byte) (VersionInfo, error) {
 	info.AnnouncementURL = versionJSON["announcement_url"]
 
 	packageURL, ok := u.downloadURL(versionJSON)
-	info.CanAutoUpdate = aghalg.BoolToNullBool(ok && info.NewVersion != u.version)
+	if !ok {
+		return info, fmt.Errorf("version.json: packageURL not found")
+	}
+
+	info.CanAutoUpdate = aghalg.BoolToNullBool(info.NewVersion != u.version)
 
 	u.newVersion = info.NewVersion
 	u.packageURL = packageURL

diff --git a/internal/updater/updater.go b/internal/updater/updater.go
@@ -174,7 +174,7 @@ func (u *Updater) prepare(exePath string) (err error) {
 
 	_, pkgNameOnly := filepath.Split(u.packageURL)
 	if pkgNameOnly == "" {
-		return fmt.Errorf("invalid PackageURL")
+		return fmt.Errorf("invalid PackageURL: %q", u.packageURL)
 	}
 
 	u.packageName = filepath.Join(u.updateDir, pkgNameOnly)