diff --git a/cmd/zenity/main.go b/cmd/zenity/main.go index 1dfeedf..3012f8d 100644 --- a/cmd/zenity/main.go +++ b/cmd/zenity/main.go @@ -82,6 +82,7 @@ var ( noCancel bool // Windows specific options + unixeol bool cygpath bool wslpath bool ) @@ -100,6 +101,9 @@ func main() { validateFlags() opts := loadFlags() zenutil.Command = true + if unixeol { + zenutil.LineBreak = "\n" + } if zenutil.Timeout > 0 { ctx, cancel := context.WithTimeout(context.Background(), time.Duration(zenutil.Timeout)*time.Second) opts = append(opts, zenity.Context(ctx)) @@ -218,6 +222,7 @@ func setupFlags() { // Windows specific options if runtime.GOOS == "windows" { + flag.BoolVar(&unixeol, "unixeol", false, "Use Unix line endings (Windows only)") flag.BoolVar(&cygpath, "cygpath", false, "Use cygpath for path translation (Windows only)") flag.BoolVar(&wslpath, "wslpath", false, "Use wslpath for path translation (Windows only)") } diff --git a/internal/zenutil/env_darwin.go b/internal/zenutil/env_darwin.go index fd9fdda..5d11472 100644 --- a/internal/zenutil/env_darwin.go +++ b/internal/zenutil/env_darwin.go @@ -1,13 +1,9 @@ package zenutil -// These are internal. -const ( - LineBreak = "\n" -) - // These are internal. var ( Command bool Timeout int + LineBreak = "\n" Separator = "\x00" ) diff --git a/internal/zenutil/env_unix.go b/internal/zenutil/env_unix.go index 154e71e..a790c93 100644 --- a/internal/zenutil/env_unix.go +++ b/internal/zenutil/env_unix.go @@ -3,14 +3,10 @@ // Package zenutil is internal. DO NOT USE. package zenutil -// These are internal. -const ( - LineBreak = "\n" -) - // These are internal. var ( Command bool Timeout int + LineBreak = "\n" Separator = "\x1e" ) diff --git a/internal/zenutil/env_windows.go b/internal/zenutil/env_windows.go index ee0957a..fdeed2b 100644 --- a/internal/zenutil/env_windows.go +++ b/internal/zenutil/env_windows.go @@ -1,13 +1,9 @@ package zenutil -// These are internal. -const ( - LineBreak = "\r\n" -) - // These are internal. var ( Command bool Timeout int Separator string + LineBreak = "\r\n" )