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

*(global): fix ARM build auto-update

Browse Source 
✅ Closes: https://github.com/AdguardTeam/AdGuardHome/issues/1391
This commit is contained in:
Andrey Meshkov
2020-02-06 20:55:37 +03:00
parent fc88f59f61
commit 808618602c
4 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
home/control_update.go
View File

@@ -42,8 +42,10 @@ func getVersionResp(data []byte) []byte {
return []byte{}
}
// the key is download_linux_arm or download_linux_arm64 for regular ARM versions
dloadName := fmt.Sprintf("download_%s_%s", runtime.GOOS, runtime.GOARCH)
if runtime.GOARCH == "arm" && ARMVersion != "6" {
if runtime.GOARCH == "arm" && ARMVersion == "5" {
// the key is download_linux_armv5 for ARMv5
dloadName = fmt.Sprintf("download_%s_%sv%s", runtime.GOOS, runtime.GOARCH, ARMVersion)
}
_, ok := versionJSON[dloadName]

6
home/home.go
View File

@@ -101,7 +101,11 @@ func run(args options) {
configureLogger(args)
// print the first message after logger is configured
log.Printf("AdGuard Home, version %s, channel %s\n", versionString, updateChannel)
msg := "AdGuard Home, version %s, channel %s\n, arch %s %s"
if ARMVersion != "" {
msg = msg + " v" + ARMVersion
}
log.Printf(msg, versionString, updateChannel, runtime.GOOS, runtime.GOARCH, ARMVersion)
log.Debug("Current working directory is %s", config.ourWorkingDir)
if args.runningAsService {
log.Info("AdGuard Home is running as a service")