Skip to content

Instantly share code, notes, and snippets.

@till

till/honk-env.diff

Created March 11, 2024 12:43
Show Gist options
  • Save till/11b4264ef751a91b7951546842c1b85a to your computer and use it in GitHub Desktop.
Save till/11b4264ef751a91b7951546842c1b85a to your computer and use it in GitHub Desktop.
Download ZIP

Revisions

  1. till created this gist Mar 11, 2024.
    31 changes: 31 additions & 0 deletions honk-env.diff
    View file
    Original file line number Diff line number Diff line change
    @@ -0,0 +1,31 @@
    diff --git a/main.go b/main.go
    index 4bc5c9a..54b5b3f 100644
    --- a/main.go
    +++ b/main.go
    @@ -103,8 +103,8 @@ func main() {
    usage()
    },
    }
    - flag.StringVar(&dataDir, "datadir", dataDir, "data directory")
    - flag.StringVar(&viewDir, "viewdir", viewDir, "view directory")
    + flag.StringVar(&dataDir, "datadir", getFromEnvOrDefault("DATA_DIR", dataDir), "data directory")
    + flag.StringVar(&viewDir, "viewdir", getFromEnvOrDefault("VIEW_DIR", viewDir), "view directory")
    flag.Usage = usage

    flag.Parse()
    diff --git a/util.go b/util.go
    index 7dad7c7..e59b9c9 100644
    --- a/util.go
    +++ b/util.go
    @@ -461,3 +461,11 @@ func openListener() (net.Listener, error) {
    listenSocket = listener
    return listener, nil
    }
    +
    +func getFromEnvOrDefault(key, value string) string {
    + v, ok := os.LookupEnv(key)
    + if !ok {
    + return value
    + }
    + return v
    +}