aboutsummaryrefslogtreecommitdiff
path: root/cmd
diff options
context:
space:
mode:
authorFumitoshi Ukai <fumitoshi.ukai@gmail.com>2015-07-10 14:28:29 +0900
committerFumitoshi Ukai <fumitoshi.ukai@gmail.com>2015-07-10 14:28:29 +0900
commit3a8cca1c1b48065abb51c20b86bc87e872a99002 (patch)
treee1b98de7fc4ce3e9a4d6c62f93e410cc18c17a38 /cmd
parent666524b3c3d428d892f99956d73097d8857ad9a0 (diff)
downloadkati-3a8cca1c1b48065abb51c20b86bc87e872a99002.tar.gz
kati -m2n also respects GOMA_DIR environment variable.
Diffstat (limited to 'cmd')
-rw-r--r--cmd/kati/main.go5
1 files changed, 4 insertions, 1 deletions
diff --git a/cmd/kati/main.go b/cmd/kati/main.go
index f8f2a82..94da316 100644
--- a/cmd/kati/main.go
+++ b/cmd/kati/main.go
@@ -166,7 +166,10 @@ func m2nsetup() {
func gomasetup() {
if gomaDir == "" {
- gomaDir = os.ExpandEnv("${HOME}/goma")
+ gomaDir = os.Getenv("GOMA_DIR")
+ if gomaDir == "" {
+ gomaDir = os.ExpandEnv("${HOME}/goma")
+ }
}
fmt.Printf("kati: setup goma: %s\n", gomaDir)
cmd := exec.Command(filepath.Join(gomaDir, "goma_ctl.py"), "ensure_start")