support multi-overlay, fixes #369

vinegarhq · Feb 18, 2024 · ae3623a · ae3623a
1 parent 6f40d4d
commit ae3623a
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 26 deletions.
diff --git a/cmd/vinegar/binary_setup.go b/cmd/vinegar/binary_setup.go
@@ -6,7 +6,10 @@ import (
 	"os"
 	"path/filepath"
 	"sort"
+	"errors"
+	"strings"
 
+	cp "github.com/otiai10/copy"
 	"github.com/vinegarhq/vinegar/internal/dirs"
 	"github.com/vinegarhq/vinegar/roblox"
 	boot "github.com/vinegarhq/vinegar/roblox/bootstrapper"
@@ -59,8 +62,16 @@ func (b *Binary) Setup() error {
 		return fmt.Errorf("apply fflags: %w", err)
 	}
 
-	if err := dirs.OverlayDir(b.Dir); err != nil {
-		return fmt.Errorf("overlay dir: %w", err)
+	overlayDir := filepath.Join(dirs.Overlays, strings.ToLower(b.Type.String()))
+	_, err := os.Stat(overlayDir)
+	if err != nil && !errors.Is(err, os.ErrNotExist) {
+		return fmt.Errorf("stat overlay: %w", err)
+	} else if err == nil {
+		slog.Info("Copying Overlay directory's files", "src", overlayDir, "path", b.Dir)
+
+		if err := cp.Copy(overlayDir, b.Dir); err != nil {
+			return fmt.Errorf("overlay dir: %w", err)
+		}
 	}
 
 	if err := b.SetupDxvk(); err != nil {

diff --git a/cmd/vinegar/main.go b/cmd/vinegar/main.go
@@ -146,4 +146,4 @@ func Delete() error {
 	}
 
 	return nil
-}
+}
diff --git a/internal/dirs/copy.go b/internal/dirs/copy.go
diff --git a/internal/dirs/dirs.go b/internal/dirs/dirs.go
@@ -11,14 +11,16 @@ var (
 	Cache     = filepath.Join(xdg.CacheHome, "vinegar")
 	Config    = filepath.Join(xdg.ConfigHome, "vinegar")
 	Data      = filepath.Join(xdg.DataHome, "vinegar")
-	Overlay   = filepath.Join(Config, "overlay")
+	Overlays  = filepath.Join(Config, "overlays")
 	Downloads = filepath.Join(Cache, "downloads")
 	Logs      = filepath.Join(Cache, "logs")
 	Prefixes  = filepath.Join(Data, "prefixes")
 	Versions  = filepath.Join(Data, "versions")
 
 	// Deprecated: Vinegar supports multiple wine prefixes
 	Prefix = filepath.Join(Data, "prefix")
+	// Deprecated: Vinegar supports multiple overlays for each Player and Studio
+	Overlay = filepath.Join(Config, "overlay")
 )
 
 func Mkdirs(dirs ...string) error {
-Original file line number
+Diff line change
@@ Expand Up / @@ -146,4 +146,4 @@ func Delete() error { @@
     	}
     	return nil
-    }
+    }