mirrors_public/schollz_croc
0
0
Fork 0
mirror of https://github.com/schollz/croc.git synced 2025-10-11 13:21:00 +02:00
Code Activity

Do not override defaults with empty values

Browse source 
This change will make it so a user who used the -remember
option on an older version of the application will be able
to use the latest version of the software without deleting
their saved config.

fixes schollz/croc#405
relates to schollz/croc#417
This commit is contained in:
Brandon Ingalls 2021-10-02 11:12:34 -05:00
parent e19e06a652
commit 860a75fee6
1 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/cli/cli.go
View file

@ -225,28 +225,28 @@ func send(c *cli.Context) (err error) {
return return
} }
// update anything that isn't explicitly set // update anything that isn't explicitly set
if !c.IsSet("relay") { if !c.IsSet("relay") && rememberedOptions.RelayAddress != "" {
crocOptions.RelayAddress = rememberedOptions.RelayAddress crocOptions.RelayAddress = rememberedOptions.RelayAddress
} }
if !c.IsSet("no-local") { if !c.IsSet("no-local") {
crocOptions.DisableLocal = rememberedOptions.DisableLocal crocOptions.DisableLocal = rememberedOptions.DisableLocal
} }
if !c.IsSet("ports") { if !c.IsSet("ports") && len(rememberedOptions.RelayPorts) > 0 {
crocOptions.RelayPorts = rememberedOptions.RelayPorts crocOptions.RelayPorts = rememberedOptions.RelayPorts
} }
if !c.IsSet("code") { if !c.IsSet("code") {
crocOptions.SharedSecret = rememberedOptions.SharedSecret crocOptions.SharedSecret = rememberedOptions.SharedSecret
} }
if !c.IsSet("pass") { if !c.IsSet("pass") && rememberedOptions.RelayPassword != "" {
crocOptions.RelayPassword = rememberedOptions.RelayPassword crocOptions.RelayPassword = rememberedOptions.RelayPassword
} }
if !c.IsSet("relay6") { if !c.IsSet("relay6") && rememberedOptions.RelayAddress6 != "" {
crocOptions.RelayAddress6 = rememberedOptions.RelayAddress6 crocOptions.RelayAddress6 = rememberedOptions.RelayAddress6
} }
if !c.IsSet("overwrite") { if !c.IsSet("overwrite") {
crocOptions.Overwrite = rememberedOptions.Overwrite crocOptions.Overwrite = rememberedOptions.Overwrite
} }
if !c.IsSet("curve") { if !c.IsSet("curve") && rememberedOptions.Curve != "" {
crocOptions.Curve = rememberedOptions.Curve crocOptions.Curve = rememberedOptions.Curve
} }
if !c.IsSet("local") { if !c.IsSet("local") {
@ -452,7 +452,7 @@ func receive(c *cli.Context) (err error) {
return return
} }
// update anything that isn't expliciGlobalIsSettly set // update anything that isn't expliciGlobalIsSettly set
if !c.IsSet("relay") { if !c.IsSet("relay") && rememberedOptions.RelayAddress != "" {
crocOptions.RelayAddress = rememberedOptions.RelayAddress crocOptions.RelayAddress = rememberedOptions.RelayAddress
} }
if !c.IsSet("yes") { if !c.IsSet("yes") {
@ -461,16 +461,16 @@ func receive(c *cli.Context) (err error) {
if crocOptions.SharedSecret == "" { if crocOptions.SharedSecret == "" {
crocOptions.SharedSecret = rememberedOptions.SharedSecret crocOptions.SharedSecret = rememberedOptions.SharedSecret
} }
if !c.IsSet("pass") { if !c.IsSet("pass") && rememberedOptions.RelayPassword != "" {
crocOptions.RelayPassword = rememberedOptions.RelayPassword crocOptions.RelayPassword = rememberedOptions.RelayPassword
} }
if !c.IsSet("relay6") { if !c.IsSet("relay6") && rememberedOptions.RelayAddress6 != "" {
crocOptions.RelayAddress6 = rememberedOptions.RelayAddress6 crocOptions.RelayAddress6 = rememberedOptions.RelayAddress6
} }
if !c.IsSet("overwrite") { if !c.IsSet("overwrite") {
crocOptions.Overwrite = rememberedOptions.Overwrite crocOptions.Overwrite = rememberedOptions.Overwrite
} }
if !c.IsSet("curve") { if !c.IsSet("curve") && rememberedOptions.Curve != "" {
crocOptions.Curve = rememberedOptions.Curve crocOptions.Curve = rememberedOptions.Curve
} }
if !c.IsSet("local") { if !c.IsSet("local") {