expand relative path ~/.config/vikunja to $HOME/.config/vikunja **WINDOWS** #147
|
@ -21,6 +21,7 @@ import (
|
||||||
"fmt"
|
"fmt"
|
||||||
"log"
|
"log"
|
||||||
"os"
|
"os"
|
||||||
|
"path"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
"strings"
|
"strings"
|
||||||
"time"
|
"time"
|
||||||
|
@ -244,10 +245,18 @@ func InitConfig() {
|
||||||
// Load the config file
|
// Load the config file
|
||||||
viper.AddConfigPath(ServiceRootpath.GetString())
|
viper.AddConfigPath(ServiceRootpath.GetString())
|
||||||
viper.AddConfigPath("/etc/vikunja/")
|
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.AddConfigPath(".")
|
||||||
viper.SetConfigName("config")
|
viper.SetConfigName("config")
|
||||||
err := viper.ReadInConfig()
|
err = viper.ReadInConfig()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Println(err.Error())
|
log.Println(err.Error())
|
||||||
log.Println("Using defaults.")
|
log.Println("Using defaults.")
|
||||||
|
|
Loading…
Reference in New Issue
Block a user