expand relative path ~/.config/vikunja to $HOME/.config/vikunja **WINDOWS** #147

Merged
konrad merged 9 commits from funkythings/api:windows-env-compat into master 2020-03-20 21:21:44 +00:00
1 changed files with 11 additions and 2 deletions
Showing only changes of commit 047b783709 - Show all commits

View File

@ -21,6 +21,7 @@ import (
"fmt"
"log"
"os"
"path"
"path/filepath"
"strings"
"time"
@ -244,10 +245,18 @@ func InitConfig() {
// Load the config file
viper.AddConfigPath(ServiceRootpath.GetString())
viper.AddConfigPath("/etc/vikunja/")
viper.AddConfigPath("$HOME/.config/vikunja")
homeDir, err := os.UserHomeDir()
if err != nil {
log.Println(err.Error())
log.Println("Using defaults.")
return
}
viper.AddConfigPath(path.Join(homeDir, ".config", "vikunja"))
viper.AddConfigPath(".")
viper.SetConfigName("config")
err := viper.ReadInConfig()
err = viper.ReadInConfig()
if err != nil {
log.Println(err.Error())
log.Println("Using defaults.")