From 6d5d80050dc358f7e7db1263e807cfdba4b3c0b2 Mon Sep 17 00:00:00 2001
From: Gareth <garethgeorge97@gmail.com>
Date: Mon, 29 Jun 2026 23:30:10 -0700
Subject: [PATCH] fix: use filepath.Join everywhere for windows compatibility

---
 cmd/backrest/backrest.go    | 7 +++----
 internal/env/environment.go | 5 ++---
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/cmd/backrest/backrest.go b/cmd/backrest/backrest.go
index 56c23784..dd78c07f 100644
--- a/cmd/backrest/backrest.go
+++ b/cmd/backrest/backrest.go
@@ -11,7 +11,6 @@ import (
 	"net/http"
 	"os"
 	"os/signal"
-	"path"
 	"path/filepath"
 	"runtime"
 	"sync"
@@ -103,7 +102,7 @@ func runApp() {
 		zap.L().Fatal("error creating orchestrator", zap.Error(err))
 	}
 
-	kvdbPath := path.Join(env.DataDir(), "kvdb.sqlite")
+	kvdbPath := filepath.Join(env.DataDir(), "kvdb.sqlite")
 	sharedKvdb, err := kvstore.NewSqliteDbForKvStore(kvdbPath)
 	if err != nil {
 		zap.L().Fatal("error creating general kvstore database pool", zap.Error(err))
@@ -150,7 +149,7 @@ func createConfigStore() config.ConfigStore {
 }
 
 func newOpLog(cfg *v1.Config) (*oplog.OpLog, *sqlitestore.SqliteStore, error) {
-	oplogFile := path.Join(env.DataDir(), "oplog.sqlite")
+	oplogFile := filepath.Join(env.DataDir(), "oplog.sqlite")
 	opstore, err := sqlitestore.NewSqliteStore(oplogFile)
 	if errors.Is(err, sqlitestore.ErrLocked) {
 		zap.L().Fatal("oplog is locked by another instance of backrest", zap.String("data_dir", env.DataDir()))
@@ -197,7 +196,7 @@ func newLogStore(opLog *oplog.OpLog) (*logstore.LogStore, func(), error) {
 }
 
 func newAuthenticator(configMgr *config.ConfigManager) *auth.Authenticator {
-	secretFile := path.Join(env.DataDir(), "jwt-secret")
+	secretFile := filepath.Join(env.DataDir(), "jwt-secret")
 	data, err := os.ReadFile(secretFile)
 	if err != nil {
 		zap.L().Info("generating new auth secret")
diff --git a/internal/env/environment.go b/internal/env/environment.go
index 01bbde4c..14c8aae0 100644
--- a/internal/env/environment.go
+++ b/internal/env/environment.go
@@ -4,7 +4,6 @@ import (
 	"flag"
 	"fmt"
 	"os"
-	"path"
 	"path/filepath"
 	"runtime"
 	"strings"
@@ -51,13 +50,13 @@ func DataDir() string {
 		return val
 	}
 	if val := os.Getenv("XDG_DATA_HOME"); val != "" {
-		return path.Join(val, "backrest")
+		return filepath.Join(val, "backrest")
 	}
 
 	if runtime.GOOS == "windows" {
 		return filepath.Join(getConfigDir(), "backrest", "data")
 	}
-	return path.Join(getHomeDir(), ".local/share/backrest")
+	return filepath.Join(getHomeDir(), ".local", "share", "backrest")
 }
 
 func BindAddress() string {