Replace dataroot module with BinDir and DataDir on instance, adapt modules

service/core/base/global.go

@@ -6,7 +6,6 @@ import (
 	"fmt"
 
 	"github.com/safing/portmaster/base/api"
-	"github.com/safing/portmaster/base/dataroot"
 	"github.com/safing/portmaster/base/info"
 	"github.com/safing/portmaster/service/mgr"
 )
@@ -15,14 +14,10 @@ import (
 var (
 	DefaultAPIListenAddress = "127.0.0.1:817"
 
-	dataDir     string
-	databaseDir string
 	showVersion bool
 )
 
 func init() {
-	flag.StringVar(&dataDir, "data", "", "set data directory")
-	flag.StringVar(&databaseDir, "db", "", "alias to --data (deprecated)")
 	flag.BoolVar(&showVersion, "version", false, "show version and exit")
 }
 
@@ -39,27 +34,6 @@ func prep(instance instance) error {
 		return mgr.ErrExecuteCmdLineOp
 	}
 
-	// check data root
-	if dataroot.Root() == nil {
-		// initialize data dir
-
-		// backwards compatibility
-		if dataDir == "" {
-			dataDir = databaseDir
-		}
-
-		// check data dir
-		if dataDir == "" {
-			return errors.New("please set the data directory using --data=/path/to/data/dir")
-		}
-
-		// initialize structure
-		err := dataroot.Initialize(dataDir, 0o0755)
-		if err != nil {
-			return err
-		}
-	}
-
 	// set api listen address
 	api.SetDefaultAPIListenAddress(DefaultAPIListenAddress)
 

service/core/base/logs.go

@@ -7,7 +7,6 @@ import (
 	"strings"
 	"time"
 
-	"github.com/safing/portmaster/base/dataroot"
 	"github.com/safing/portmaster/base/log"
 	"github.com/safing/portmaster/service/mgr"
 )
@@ -26,7 +25,7 @@ func logCleaner(_ *mgr.WorkerCtx) error {
 	ageThreshold := time.Now().Add(-logTTL)
 
 	return filepath.Walk(
-		filepath.Join(dataroot.Root().Path, logFileDir),
+		filepath.Join(module.instance.DataDir(), logFileDir),
 		func(path string, info os.FileInfo, err error) error {
 			if err != nil {
 				if !errors.Is(err, os.ErrNotExist) {

service/core/base/module.go

@@ -58,5 +58,6 @@ func New(instance instance) (*Base, error) {
 }
 
 type instance interface {
+	DataDir() string
 	SetCmdLineOperation(f func() error)
 }