Fix home user directory detection handling (thomiceli#145)

jiriks74 · Oct 31, 2023 · dcacde0 · dcacde0
1 parent 064d4d5
commit dcacde0
Showing 1 changed file with 10 additions and 5 deletions.
diff --git a/internal/config/config.go b/internal/config/config.go
@@ -52,14 +52,10 @@ type config struct {
 }
 
 func configWithDefaults() (*config, error) {
- homeDir, err := os.UserHomeDir()
  c := &config{}
- if err != nil {
- return c, err
- }
 
  c.LogLevel = "warn"
- c.OpengistHome = filepath.Join(homeDir, ".opengist")
+ c.OpengistHome = ""
  c.DBFilename = "opengist.db"
 
  c.SqliteJournalMode = "WAL"
@@ -93,6 +89,15 @@ func InitConfig(configPath string) error {
  return err
  }
 
+ if c.OpengistHome == "" {
+ homeDir, err := os.UserHomeDir()
+ if err != nil {
+ return fmt.Errorf("opengist home directory is not set and current user home directory could not be determined; please specify the opengist home directory manually via the configuration")
+ }
+
+ c.OpengistHome = filepath.Join(homeDir, ".opengist")
+ }
+
  if err = checks(c); err != nil {
  return err
  }