Adapt pmctl to new update package in portbase

This commit is contained in:
Daniel
2019-10-25 13:29:16 +02:00
parent bfde6cb044
commit 90c89eb012
7 changed files with 101 additions and 76 deletions

View File

@@ -9,8 +9,9 @@ import (
"strings"
"syscall"
"github.com/safing/portbase/updater"
"github.com/safing/portmaster/core/structure"
"github.com/safing/portmaster/updates"
"github.com/safing/portbase/utils"
@@ -28,6 +29,17 @@ var (
showShortVersion bool
showFullVersion bool
// create registry
registry = &updater.ResourceRegistry{
Name: "updates",
UpdateURLs: []string{
"https://updates.safing.io",
},
Beta: false,
DevMode: false,
Online: false,
}
rootCmd = &cobra.Command{
Use: "portmaster-control",
Short: "Controller for all portmaster components",
@@ -153,8 +165,24 @@ func cmdSetup(cmd *cobra.Command, args []string) (err error) {
return fmt.Errorf("failed to initialize data root: %s", err)
}
dataRoot = structure.Root()
// manually set updates root (no modules)
updates.SetDataRoot(structure.Root())
// initialize registry
err := registry.Initialize(structure.Root().ChildDir("updates", 0755))
if err != nil {
return err
}
err = registry.LoadIndexes()
if err != nil {
return err
}
err = registry.ScanStorage("")
if err != nil {
log.Printf("WARNING: error during storage scan: %s\n", err)
}
registry.SelectVersions()
}
// logs and warning