apache
diff --git a/‎config/config.go‎
Lines changed: 17 additions & 2 deletions b/‎config/config.go‎
Lines changed: 17 additions & 2 deletions
diff --git a/‎go.mod‎
Lines changed: 1 addition & 0 deletions b/‎go.mod‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎go.sum‎
Lines changed: 2 additions & 0 deletions b/‎go.sum‎
Lines changed: 2 additions & 0 deletions
diff --git a/‎vendor/github.com/gofrs/flock/.gitignore‎
Lines changed: 24 additions & 0 deletions b/‎vendor/github.com/gofrs/flock/.gitignore‎
Lines changed: 24 additions & 0 deletions
diff --git a/‎vendor/github.com/gofrs/flock/.travis.yml‎
Lines changed: 10 additions & 0 deletions b/‎vendor/github.com/gofrs/flock/.travis.yml‎
Lines changed: 10 additions & 0 deletions
diff --git a/‎vendor/github.com/gofrs/flock/LICENSE‎
Lines changed: 27 additions & 0 deletions b/‎vendor/github.com/gofrs/flock/LICENSE‎
Lines changed: 27 additions & 0 deletions
diff --git a/‎vendor/github.com/gofrs/flock/README.md‎
Lines changed: 40 additions & 0 deletions b/‎vendor/github.com/gofrs/flock/README.md‎
Lines changed: 40 additions & 0 deletions
diff --git a/‎vendor/github.com/gofrs/flock/appveyor.yml‎
Lines changed: 25 additions & 0 deletions b/‎vendor/github.com/gofrs/flock/appveyor.yml‎
Lines changed: 25 additions & 0 deletions
diff --git a/‎vendor/github.com/gofrs/flock/flock.go‎
Lines changed: 127 additions & 0 deletions b/‎vendor/github.com/gofrs/flock/flock.go‎
Lines changed: 127 additions & 0 deletions
@@ -27,6 +27,7 @@ import (
 	"strconv"
 	"time"
 
+	"github.com/gofrs/flock"
 	"github.com/mitchellh/go-homedir"
 	"gopkg.in/ini.v1"
 )
@@ -140,6 +141,18 @@ func newHTTPClient(cfg *Config) *http.Client {
 }
 
 func reloadConfig(cfg *Config) *Config {
+	fileLock := flock.New(path.Join(getDefaultConfigDir(), "lock"))
+	err := fileLock.Lock()
+	if err != nil {
+		fmt.Println("Failed to grab config file lock, please try again")
+		return cfg
+	}
+	cfg = saveConfig(cfg)
+	fileLock.Unlock()
+	return cfg
+}
+
+func saveConfig(cfg *Config) *Config {
 	if _, err := os.Stat(cfg.Dir); err != nil {
 		os.Mkdir(cfg.Dir, 0700)
 	}
@@ -214,7 +227,7 @@ func reloadConfig(cfg *Config) *Config {
 }
 
 // UpdateConfig updates and saves config
-func (c *Config) UpdateConfig(key string, value string) {
+func (c *Config) UpdateConfig(key string, value string, update bool) {
 	switch key {
 	case "prompt":
 		c.Core.Prompt = value
@@ -246,7 +259,9 @@ func (c *Config) UpdateConfig(key string, value string) {
 		c.Core.VerifyCert = value == "true"
 	}
 
-	reloadConfig(c)
+	if update {
+		reloadConfig(c)
+	}
 }
 
 // NewConfig creates or reload config and loads API cache
 
@@ -21,6 +21,7 @@ require (
 	github.com/briandowns/spinner v0.0.0-20181018151057-dd69c579ff20
 	github.com/c-bata/go-prompt v0.2.2
 	github.com/fatih/color v1.7.0 // indirect
+	github.com/gofrs/flock v0.7.0
 	github.com/google/shlex v0.0.0-20150127133951-6f45313302b9
 	github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 // indirect
 	github.com/jtolds/gls v4.2.1+incompatible // indirect
 
@@ -4,6 +4,8 @@ github.com/c-bata/go-prompt v0.2.2 h1:uyKRz6Z6DUyj49QVijyM339UJV9yhbr70gESwbNU3e
 github.com/c-bata/go-prompt v0.2.2/go.mod h1:VzqtzE2ksDBcdln8G7mk2RX9QyGjH+OVqOCSiVIqS34=
 github.com/fatih/color v1.7.0 h1:DkWD4oS2D8LGGgTQ6IvwJJXSL5Vp2ffcQg58nFV38Ys=
 github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
+github.com/gofrs/flock v0.7.0 h1:pGFUjl501gafK9HBt1VGL1KCOd/YhIooID+xgyJCf3g=
+github.com/gofrs/flock v0.7.0/go.mod h1:F1TvTiK9OcQqauNUHlbJvyl9Qa1QvF/gOUDKA14jxHU=
 github.com/google/shlex v0.0.0-20150127133951-6f45313302b9 h1:JM174NTeGNJ2m/oLH3UOWOvWQQKd+BoL3hcSCUWFLt0=
 github.com/google/shlex v0.0.0-20150127133951-6f45313302b9/go.mod h1:RpwtwJQFrIEPstU94h88MWPXP2ektJZ8cZ0YntAmXiE=
 github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 h1:EGx4pi6eqNxGaHF6qqu48+N2wcFQ5qg5FXgOdqsJ5d8=