diff --git a/backend/db/downloads.go b/backend/db/downloads.go index b9d7122..fcd1221 100644 --- a/backend/db/downloads.go +++ b/backend/db/downloads.go @@ -56,8 +56,8 @@ func UpdateDownload(id string) error { WHERE chunk + 1 >= total_chunks AND id=$1` - err := db.QueryRow(s, id, time.Now().UTC()) - return err.Err() + _, err := db.Exec(s, id, time.Now().UTC()) + return err } // CleanUpDownloads removes all in-progress downloads that haven't been updated diff --git a/backend/server/html/templates/header.html b/backend/server/html/templates/header.html index 879f4a9..8f26d3d 100644 --- a/backend/server/html/templates/header.html +++ b/backend/server/html/templates/header.html @@ -5,15 +5,15 @@
{{ if .Base.LoggedIn }} {{ if eq .Base.Page "pass" }} - Pass + Passwords {{ else }} - Pass + Passwords {{ end }} {{ if eq .Base.Page "vault" }} - Vault + Files {{ else }} - Vault + Files {{ end }} {{ if eq .Base.Page "send" }} diff --git a/cli/config/config.go b/cli/config/config.go index 300c5a3..5de5b17 100644 --- a/cli/config/config.go +++ b/cli/config/config.go @@ -50,20 +50,20 @@ var defaultConfig string func setupConfigDir() (Paths, error) { var localConfig string var configErr error - if runtime.GOOS == "windows" { - baseDir, err := os.UserConfigDir() + if runtime.GOOS == "darwin" { + baseDir, err := os.UserHomeDir() if err != nil { return Paths{}, err } - localConfig, configErr = makeConfigDirectories(baseDir, "yeetfile") + localConfig, configErr = makeConfigDirectories(baseDir, baseConfigPath) } else { - baseDir, err := os.UserHomeDir() + baseDir, err := os.UserConfigDir() if err != nil { return Paths{}, err } - localConfig, configErr = makeConfigDirectories(baseDir, baseConfigPath) + localConfig, configErr = makeConfigDirectories(baseDir, "yeetfile") } if configErr != nil {