From 79b61b86c9b5cd403c5ff3efcaf5a7237a1c07c7 Mon Sep 17 00:00:00 2001 From: Tulir Asokan Date: Wed, 8 Apr 2020 15:49:42 +0300 Subject: Use $HOME/Downloads as default download directory TODO: Get the default directory properly with XDG --- main.go | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'main.go') diff --git a/main.go b/main.go index 43f4d2b..e16aa48 100644 --- a/main.go +++ b/main.go @@ -58,8 +58,14 @@ func main() { fmt.Fprintln(os.Stderr, "Failed to get cache directory:", err) os.Exit(3) } + downloadDir, err := UserDownloadDir() + if err != nil { + fmt.Fprintln(os.Stderr, "Failed to get download directory:", err) + os.Exit(3) + } - gmx := NewGomuks(MainUIProvider, configDir, cacheDir) + + gmx := NewGomuks(MainUIProvider, configDir, cacheDir, downloadDir) gmx.Start() // We use os.Exit() everywhere, so exiting by returning from Start() shouldn't happen. @@ -77,6 +83,11 @@ func UserCacheDir() (dir string, err error) { return } +func UserDownloadDir() (dir string, err error) { + dir = os.Getenv("HOME") + return filepath.Join(dir, "Downloads"), nil +} + func UserConfigDir() (dir string, err error) { dir = os.Getenv("GOMUKS_CONFIG_HOME") if dir != "" { -- cgit v1.2.3