1
0
mirror of https://github.com/AvengeMedia/DankMaterialShell.git synced 2026-04-14 01:32:29 -04:00

matugen: support v4

This commit is contained in:
bbedward
2026-02-13 09:40:51 -05:00
parent d60e70f9cc
commit b8e5f9f3b1

View File

@@ -80,6 +80,7 @@ func (c *ColorMode) GTKTheme() string {
var ( var (
matugenVersionOnce sync.Once matugenVersionOnce sync.Once
matugenSupportsCOE bool matugenSupportsCOE bool
matugenIsV4 bool
) )
type Options struct { type Options struct {
@@ -537,9 +538,13 @@ func checkMatugenVersion() {
} }
matugenSupportsCOE = major > 3 || (major == 3 && minor >= 1) matugenSupportsCOE = major > 3 || (major == 3 && minor >= 1)
matugenIsV4 = major >= 4
if matugenSupportsCOE { if matugenSupportsCOE {
log.Infof("Matugen %s supports --continue-on-error", versionStr) log.Infof("Matugen %s supports --continue-on-error", versionStr)
} }
if matugenIsV4 {
log.Infof("Matugen %s: using v4 flags", versionStr)
}
}) })
} }
@@ -549,6 +554,9 @@ func runMatugen(args []string) error {
if matugenSupportsCOE { if matugenSupportsCOE {
args = append([]string{"--continue-on-error"}, args...) args = append([]string{"--continue-on-error"}, args...)
} }
if matugenIsV4 {
args = append(args, "--source-color-index", "0")
}
cmd := exec.Command("matugen", args...) cmd := exec.Command("matugen", args...)
cmd.Stdout = os.Stdout cmd.Stdout = os.Stdout
@@ -557,6 +565,8 @@ func runMatugen(args []string) error {
} }
func runMatugenDryRun(opts *Options) (string, error) { func runMatugenDryRun(opts *Options) (string, error) {
checkMatugenVersion()
var args []string var args []string
switch opts.Kind { switch opts.Kind {
case "hex": case "hex":
@@ -565,6 +575,9 @@ func runMatugenDryRun(opts *Options) (string, error) {
args = []string{opts.Kind, opts.Value} args = []string{opts.Kind, opts.Value}
} }
args = append(args, "-m", "dark", "-t", opts.MatugenType, "--json", "hex", "--dry-run") args = append(args, "-m", "dark", "-t", opts.MatugenType, "--json", "hex", "--dry-run")
if matugenIsV4 {
args = append(args, "--source-color-index", "0", "--old-json-output")
}
cmd := exec.Command("matugen", args...) cmd := exec.Command("matugen", args...)
output, err := cmd.Output() output, err := cmd.Output()