Robot
/
croc
mirror of https://github.com/schollz/croc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

toggling parameters

This commit is contained in:
Zack Scholl 2019-07-17 17:26:42 -06:00
parent 54fb8aec9d
commit 97d18e1fbf
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/cli/cli.go
View File

@ -126,7 +126,7 @@ func send(c *cli.Context) (err error) {
var crocOptions croc.Options var crocOptions croc.Options
b, errOpen := ioutil.ReadFile(configFile) b, errOpen := ioutil.ReadFile(configFile)
if errOpen == nil { if errOpen == nil && !c.GlobalBool("remember") {
err = json.Unmarshal(b, &crocOptions) err = json.Unmarshal(b, &crocOptions)
if err != nil { if err != nil {
log.Error(err) log.Error(err)
@ -136,19 +136,22 @@ func send(c *cli.Context) (err error) {
if crocOptions.Debug != c.GlobalBool("debug") { if crocOptions.Debug != c.GlobalBool("debug") {
crocOptions.Debug = c.GlobalBool("debug") crocOptions.Debug = c.GlobalBool("debug")
} }
if crocOptions.NoPrompt != c.GlobalBool("yes") { if c.GlobalBool("yes") {
crocOptions.NoPrompt = c.GlobalBool("yes") crocOptions.NoPrompt = c.GlobalBool("yes")
} }
if crocOptions.RelayAddress != c.GlobalString("relay") { if crocOptions.RelayAddress != c.GlobalString("relay") {
crocOptions.RelayAddress = c.GlobalString("relay") crocOptions.RelayAddress = c.GlobalString("relay")
} }
if crocOptions.Stdout != c.GlobalBool("stdout") { if c.GlobalBool("stdout") {
crocOptions.Stdout = c.GlobalBool("stdout") crocOptions.Stdout = c.GlobalBool("stdout")
} }
if crocOptions.DisableLocal != c.Bool("no-local") { // TODO: use c.IsSet
if c.Bool("no-local") {
crocOptions.DisableLocal = c.Bool("no-local") crocOptions.DisableLocal = c.Bool("no-local")
} }
// TODO: add ports // TODO: add ports
if c.String("code") != "" { if c.String("code") != "" {
crocOptions.SharedSecret = "" crocOptions.SharedSecret = ""
} }