From 91f92f2eac236ee34c5f20249e39ca041aa92a7b Mon Sep 17 00:00:00 2001 From: Adnan Maolood Date: Wed, 2 Feb 2022 14:29:21 -0500 Subject: [PATCH] gitsrht-{shell,update-hook}: Support SRHT_CONFIG variable Attempt to load the configuration file from the path specified in the SRHT_CONFIG environment variable. If that fails, fallback to /etc/sr.ht/config.ini. --- gitsrht-shell/main.go | 2 +- gitsrht-update-hook/main.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gitsrht-shell/main.go b/gitsrht-shell/main.go index c6cea3c..35383ce 100644 --- a/gitsrht-shell/main.go +++ b/gitsrht-shell/main.go @@ -77,7 +77,7 @@ func main() { } pusherName = os.Args[2] - for _, path := range []string{"../config.ini", "/etc/sr.ht/config.ini"} { + for _, path := range []string{os.Getenv("SRHT_CONFIG"), "/etc/sr.ht/config.ini"} { config, err = ini.LoadFile(path) if err == nil { break diff --git a/gitsrht-update-hook/main.go b/gitsrht-update-hook/main.go index a281ec1..c108386 100644 --- a/gitsrht-update-hook/main.go +++ b/gitsrht-update-hook/main.go @@ -47,7 +47,7 @@ func init() { logger = log.New(logf, os.Args[0]+" ", log.LstdFlags) } - for _, path := range []string{"../config.ini", "/etc/sr.ht/config.ini"} { + for _, path := range []string{os.Getenv("SRHT_CONFIG"), "/etc/sr.ht/config.ini"} { config, err = ini.LoadFile(path) if err == nil { break -- 2.38.4