From 05f7bafd565262d53d1c77770300adb221c6890b Mon Sep 17 00:00:00 2001 From: maddalax Date: Mon, 23 Sep 2024 15:57:05 -0500 Subject: [PATCH] .exe for tailwind cli windows --- cli/htmgo/tasks/css/css.go | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/cli/htmgo/tasks/css/css.go b/cli/htmgo/tasks/css/css.go index a736e6a..bcc06d9 100644 --- a/cli/htmgo/tasks/css/css.go +++ b/cli/htmgo/tasks/css/css.go @@ -29,12 +29,21 @@ func Setup() bool { return true } +func GetTailwindExecutableName() string { + if runtime.GOOS == "windows" { + return "./__htmgo/tailwind.exe" + } else { + return "./__htmgo/tailwind" + } +} + func GenerateCss(flags ...process.RunFlag) error { if !Setup() { return nil } + exec := GetTailwindExecutableName() return process.RunMany([]string{ - "./__htmgo/tailwind -i ./assets/css/input.css -o ./assets/dist/main.css -c ./tailwind.config.js", + fmt.Sprintf("%s -i ./assets/css/input.css -o ./assets/dist/main.css -c ./tailwind.config.js", exec), }, append(flags, process.Silent)...) } @@ -42,14 +51,15 @@ func GenerateCssWatch(flags ...process.RunFlag) error { if !Setup() { return nil } + exec := GetTailwindExecutableName() return process.RunMany([]string{ - "./__htmgo/tailwind -i ./assets/css/input.css -o ./assets/dist/main.css -c ./tailwind.config.js --watch=always", + fmt.Sprintf("%s -i ./assets/css/input.css -o ./assets/dist/main.css -c ./tailwind.config.js --watch=always", exec), }, append(flags, process.KillOnlyOnExit, process.Silent)...) } func downloadTailwindCli() { - if dirutil.HasFileFromRoot("__htmgo/tailwind") { + if dirutil.HasFileFromRoot(GetTailwindExecutableName()) { slog.Debug("Tailwind CLI already exists. Skipping download.") return } @@ -91,9 +101,11 @@ func downloadTailwindCli() { }, process.ExitOnError) } + outputFileName := GetTailwindExecutableName() + err := dirutil.MoveFile( filepath.Join(process.GetWorkingDir(), fileName), - filepath.Join(process.GetWorkingDir(), "__htmgo/tailwind")) + filepath.Join(process.GetWorkingDir(), outputFileName)) if err != nil { log.Fatalf("Error moving file: %s\n", err.Error())