vikarti.anatra/safing-portmaster
1
0
Fork 0
mirror of https://github.com/safing/portmaster synced 2025-09-02 02:29:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Update updates module to download and upgrade portmaster-start instead of portmaster-control

Browse source
This commit is contained in:
Patrick Pacher 2020-07-16 15:17:21 +02:00
parent 58dad190a1
commit 5580cbf4a4
No known key found for this signature in database
GPG key ID: E8CD2DA160925A6D
2 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
updates/main.go
View file

@ -101,7 +101,7 @@ func start() error {
if onWindows { if onWindows {
mandatoryUpdates = []string{ mandatoryUpdates = []string{
platform("core/portmaster-core.exe"), platform("core/portmaster-core.exe"),
platform("control/portmaster-control.exe"), platform("start/portmaster-start.exe"),
platform("app/portmaster-app.exe"), platform("app/portmaster-app.exe"),
platform("notifier/portmaster-notifier.exe"), platform("notifier/portmaster-notifier.exe"),
platform("notifier/portmaster-snoretoast.exe"), platform("notifier/portmaster-snoretoast.exe"),
@ -109,7 +109,7 @@ func start() error {
} else { } else {
mandatoryUpdates = []string{ mandatoryUpdates = []string{
platform("core/portmaster-core"), platform("core/portmaster-core"),
platform("control/portmaster-control"), platform("start/portmaster-start"),
platform("app/portmaster-app"), platform("app/portmaster-app"),
platform("notifier/portmaster-notifier"), platform("notifier/portmaster-notifier"),
} }

26
updates/upgrader.go
View file

@ -51,10 +51,10 @@ func upgrader(_ context.Context, _ interface{}) error {
} }
defer upgraderActive.SetTo(false) defer upgraderActive.SetTo(false)
// upgrade portmaster control // upgrade portmaster-start
err := upgradePortmasterControl() err := upgradePortmasterStart()
if err != nil { if err != nil {
log.Warningf("updates: failed to upgrade portmaster-control: %s", err) log.Warningf("updates: failed to upgrade portmaster-start: %s", err)
} }
err = upgradeCoreNotify() err = upgradeCoreNotify()
@ -122,16 +122,16 @@ func upgradeCoreNotifyActionHandler(n *notifications.Notification) {
} }
} }
func upgradePortmasterControl() error { func upgradePortmasterStart() error {
filename := "portmaster-control" filename := "portmaster-start"
if onWindows { if onWindows {
filename += ".exe" filename += ".exe"
} }
// check if we can upgrade // check if we can upgrade
if pmCtrlUpdate == nil || pmCtrlUpdate.UpgradeAvailable() { if pmCtrlUpdate == nil || pmCtrlUpdate.UpgradeAvailable() {
// get newest portmaster-control // get newest portmaster-start
new, err := GetPlatformFile("control/" + filename) // identifier, use forward slash! new, err := GetPlatformFile("start/" + filename) // identifier, use forward slash!
if err != nil { if err != nil {
return err return err
} }
@ -140,15 +140,15 @@ func upgradePortmasterControl() error {
return nil return nil
} }
// update portmaster-control in data root // update portmaster-start in data root
rootControlPath := filepath.Join(filepath.Dir(registry.StorageDir().Path), filename) rootPmStartPath := filepath.Join(filepath.Dir(registry.StorageDir().Path), filename)
err := upgradeFile(rootControlPath, pmCtrlUpdate) err := upgradeFile(rootPmStartPath, pmCtrlUpdate)
if err != nil { if err != nil {
return err return err
} }
log.Infof("updates: upgraded %s", rootControlPath) log.Infof("updates: upgraded %s", rootPmStartPath)
// upgrade parent process, if it's portmaster-control // upgrade parent process, if it's portmaster-start
parent, err := processInfo.NewProcess(int32(os.Getppid())) parent, err := processInfo.NewProcess(int32(os.Getppid()))
if err != nil { if err != nil {
return fmt.Errorf("could not get parent process for upgrade checks: %w", err) return fmt.Errorf("could not get parent process for upgrade checks: %w", err)
@ -158,7 +158,7 @@ func upgradePortmasterControl() error {
return fmt.Errorf("could not get parent process name for upgrade checks: %w", err) return fmt.Errorf("could not get parent process name for upgrade checks: %w", err)
} }
if parentName != filename { if parentName != filename {
log.Tracef("updates: parent process does not seem to be portmaster-control, name is %s", parentName) log.Tracef("updates: parent process does not seem to be portmaster-start, name is %s", parentName)
return nil return nil
} }
parentPath, err := parent.Exe() parentPath, err := parent.Exe()