ami/tl-vikunja
1
0
Fork 0
Code Activity

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

Browse Source 
apply correct formatting

add quotes to make the yaml gods happy

log path of config file used by viper

resolve merge conflicts: windows compatible $HOME path

Prepare changelog & readme for 0.11 release

expand relative path ~/.config/vikunja to $HOME/.config/vikunja (#146)

update dependencies

expand relative path ~/.config/vikunja

Co-authored-by: Julian <juliangaal@protonmail.com>
Co-authored-by: konrad <konrad@kola-entertainments.de>

Co-authored-by: Julian Gaal <gjulian@uos.de>
Reviewed-on: https://kolaente.dev/vikunja/api/pulls/147
Reviewed-by: konrad <konrad@kola-entertainments.de>
This commit is contained in:
funkythings
2020-03-20 21:21:44 +00:00
committed by konrad
parent 5126330a10
commit 51c74de1de
3 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
pkg/config/config.go
View File

@ -21,6 +21,7 @@ import (
"fmt"
"log"
"os"
"path"
"path/filepath"
"strings"
"time"
@ -250,14 +251,25 @@ func InitConfig() {
// Load the config file
viper.AddConfigPath(ServiceRootpath.GetString())
viper.AddConfigPath("/etc/vikunja/")
viper.AddConfigPath("$HOME/.config/vikunja")
viper.AddConfigPath(".")
viper.SetConfigName("config")
err := viper.ReadInConfig()
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()
if err != nil {
log.Println(err.Error())
log.Println("Using defaults.")
return
}
log.Println("Found config file:", viper.ConfigFileUsed())
}
func random(length int) (string, error) {