Fix order of loading config directory

open-pomodoro · Jan 18, 2021 · c40c0bd · c40c0bd
1 parent 5cddc6f
commit c40c0bd
Showing 1 changed file with 14 additions and 12 deletions.
diff --git a/cmd/root.go b/cmd/root.go
@@ -28,18 +28,6 @@ var (
 )
 
 func init() {
-	var err error
-
-	client, err = openpomodoro.NewClient(directoryFlag)
-	if err != nil {
-		log.Fatalf("Could not create client: %v", err)
-	}
-
-	settings, err = client.Settings()
-	if err != nil {
-		log.Fatalf("Could not retrieve settings: %v", err)
-	}
-
 	cobra.OnInitialize(initConfig)
 
 	RootCmd.PersistentFlags().StringVarP(
@@ -53,6 +41,20 @@ func init() {
 	RootCmd.PersistentFlags().BoolVarP(
 		&waitFlag, "wait", "w", false,
 		"wait for the Pomodoro to end before exiting")
+
+	viper.AutomaticEnv()
+
+	var err error
+
+	client, err = openpomodoro.NewClient(directoryFlag)
+	if err != nil {
+		log.Fatalf("Could not create client: %v", err)
+	}
+
+	settings, err = client.Settings()
+	if err != nil {
+		log.Fatalf("Could not retrieve settings: %v", err)
+	}
 }
 
 func initConfig() {