From 0fab58486d9886b58deb4d3bee1b903beccd589a Mon Sep 17 00:00:00 2001
From: sentriz <senan@senan.xyz>
Date: Tue, 16 Jul 2019 15:43:12 +0100
Subject: [PATCH] parse env vars for scanner

---
 cmd/gonic/main.go     | 5 ++---
 cmd/gonicscan/main.go | 9 +++++++--
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/cmd/gonic/main.go b/cmd/gonic/main.go
index e6eed30..638c7d5 100644
--- a/cmd/gonic/main.go
+++ b/cmd/gonic/main.go
@@ -31,12 +31,11 @@ func main() {
 	_ = set.String(
 		"config-path", "",
 		"path to config (optional)")
-	err := ff.Parse(set, os.Args[1:],
+	if err := ff.Parse(set, os.Args[1:],
 		ff.WithConfigFileFlag("config-path"),
 		ff.WithConfigFileParser(ff.PlainParser),
 		ff.WithEnvVarPrefix(programVar),
-	)
-	if err != nil {
+	); err != nil {
 		log.Fatalf("error parsing args: %v\n", err)
 	}
 	if _, err := os.Stat(*musicPath); os.IsNotExist(err) {
diff --git a/cmd/gonicscan/main.go b/cmd/gonicscan/main.go
index fc801f9..0ebe7f3 100644
--- a/cmd/gonicscan/main.go
+++ b/cmd/gonicscan/main.go
@@ -12,7 +12,10 @@ import (
 	"senan.xyz/g/gonic/scanner"
 )
 
-const programName = "gonicscan"
+const (
+	programName = "gonicscan"
+	programVar  = "GONIC"
+)
 
 func main() {
 	set := flag.NewFlagSet(programName, flag.ExitOnError)
@@ -22,7 +25,9 @@ func main() {
 	dbPath := set.String(
 		"db-path", "gonic.db",
 		"path to database (optional)")
-	if err := ff.Parse(set, os.Args[1:]); err != nil {
+	if err := ff.Parse(set, os.Args[1:],
+		ff.WithEnvVarPrefix(programVar),
+	); err != nil {
 		log.Fatalf("error parsing args: %v\n", err)
 	}
 	if _, err := os.Stat(*musicPath); os.IsNotExist(err) {