daxi20/AdGuardHome
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix version/channel linking

Browse Source
This commit is contained in:
Andrey Meshkov
2019-06-20 14:36:26 +03:00
parent 4ddae72faf
commit f1e6a30931
5 changed files with 29 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
home/control_update.go
View File

@@ -43,7 +43,7 @@ func getVersionResp(data []byte) []byte {
}
_, ok := versionJSON[fmt.Sprintf("download_%s_%s", runtime.GOOS, runtime.GOARCH)]
if ok && ret["new_version"] != VersionString && VersionString >= selfUpdateMinVersion {
if ok && ret["new_version"] != versionString && versionString >= selfUpdateMinVersion {
ret["can_autoupdate"] = true
}
@@ -145,12 +145,12 @@ func getUpdateInfo(jsonData []byte) (*updateInfo, error) {
return nil, fmt.Errorf("Invalid JSON")
}
if u.newVer == VersionString {
if u.newVer == versionString {
return nil, fmt.Errorf("No need to update")
}
u.updateDir = filepath.Join(workDir, fmt.Sprintf("agh-update-%s", u.newVer))
u.backupDir = filepath.Join(workDir, fmt.Sprintf("agh-backup-%s", VersionString))
u.backupDir = filepath.Join(workDir, fmt.Sprintf("agh-backup-%s", versionString))
_, pkgFileName := filepath.Split(u.pkgURL)
if len(pkgFileName) == 0 {
@@ -360,7 +360,7 @@ func getPackageFile(u *updateInfo) error {
// Perform an update procedure
func doUpdate(u *updateInfo) error {
log.Info("Updating from %s to %s. URL:%s Package:%s",
VersionString, u.newVer, u.pkgURL, u.pkgName)
versionString, u.newVer, u.pkgURL, u.pkgName)
_ = os.Mkdir(u.updateDir, 0755)