a
/
badguardhome
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge: * auto-update: check if executable file exists 

Close #1307

* commit '1792fd3e0f2a7a73536e2bdb29973074be8adf57':
  * auto-update: check if executable file exists
This commit is contained in:
Simon Zolin 2020-01-15 18:52:23 +03:00
parent 47631105c7 1792fd3e0f
commit d154502b31
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
home/control_update.go
View File

@ -148,6 +148,15 @@ type updateInfo struct {
newBinName string // Full path to the new executable file newBinName string // Full path to the new executable file
} }
// Return TRUE if file exists
func fileExists(fn string) bool {
_, err := os.Stat(fn)
if err != nil {
return false
}
return true
}
// Fill in updateInfo object // Fill in updateInfo object
func getUpdateInfo(jsonData []byte) (*updateInfo, error) { func getUpdateInfo(jsonData []byte) (*updateInfo, error) {
var u updateInfo var u updateInfo
@ -190,6 +199,9 @@ func getUpdateInfo(jsonData []byte) (*updateInfo, error) {
binName = "AdGuardHome.exe" binName = "AdGuardHome.exe"
} }
u.curBinName = filepath.Join(workDir, binName) u.curBinName = filepath.Join(workDir, binName)
if !fileExists(u.curBinName) {
return nil, fmt.Errorf("Executable file %s doesn't exist", u.curBinName)
}
u.bkpBinName = filepath.Join(u.backupDir, binName) u.bkpBinName = filepath.Join(u.backupDir, binName)
u.newBinName = filepath.Join(u.updateDir, "AdGuardHome", binName) u.newBinName = filepath.Join(u.updateDir, "AdGuardHome", binName)
if strings.HasSuffix(pkgFileName, ".zip") { if strings.HasSuffix(pkgFileName, ".zip") {