From 0c65d4b9a684795b817335a1cf6e8946086d2f1e Mon Sep 17 00:00:00 2001 From: docolli <78646938+docolli@users.noreply.github.com> Date: Tue, 8 Jul 2025 18:38:42 +0200 Subject: [PATCH] Update main.go Make user home dir OS independent. Now carwings cmd works also on windows --- cmd/carwings/main.go | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/cmd/carwings/main.go b/cmd/carwings/main.go index 2fdb128..a2318bc 100644 --- a/cmd/carwings/main.go +++ b/cmd/carwings/main.go @@ -64,13 +64,21 @@ func main() { cfg config username, password string region, sessionFile string + homeFolder string ) + homeFolder, err := os.UserHomeDir() + if err != nil { + fmt.Fprintf(os.Stderr, "ERROR: could not get user homedir\n") + os.Exit(1) + } + fmt.Fprintf(os.Stderr, "User homedir found: "+homeFolder+"\n") + fs := flag.NewFlagSet("carwings", flag.ExitOnError) fs.StringVar(&username, "username", "", "carwings username") fs.StringVar(&password, "password", "", "carwings password") fs.StringVar(®ion, "region", carwings.RegionUSA, "carwings region. Defaults to US (NNA).") - fs.StringVar(&sessionFile, "session-file", "~/.carwings-session", "carwings session file") + fs.StringVar(&sessionFile, "session-file", homeFolder+"/.carwings-session", "carwings session file") fs.StringVar(&cfg.units, "units", unitsMiles, "units to use (miles or km). Defaults to miles.") fs.StringVar(&cfg.effunits, "effunits", unitskWhPerMile, "efficiency units to use (kWh/mile, kWh/km or kWh/100km). Defaults to kWh/mile.") fs.StringVar(&carwings.BaseURL, "url", carwings.BaseURL, "base carwings api endpoint to use")