Commit f61185b8 authored by Ash McKenzie's avatar Ash McKenzie

Merge branch '187-respect-gitlab-shell-dir-envvar-in-go' into 'master'

Respect GITLAB_SHELL_DIR in the Go version

Closes #187

See merge request gitlab-org/gitlab-shell!309
parents 5ee3270e 220bb45d
......@@ -14,6 +14,10 @@ import (
// findRootDir determines the root directory (and so, the location of the config
// file) from os.Executable()
func findRootDir() (string, error) {
if path := os.Getenv("GITLAB_SHELL_DIR"); path != "" {
return path, nil
}
path, err := os.Executable()
if err != nil {
return "", err
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment