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

fix: address shared secret before creatgin

Browse source
This commit is contained in:
Zack 2024-05-20 10:16:02 -07:00
parent 863dabb93a
commit bb018fd725
1 changed files with 22 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

44
src/cli/cli.go
View file

@ -313,18 +313,11 @@ func send(c *cli.Context) (err error) {
return return
} }
cr, err := croc.New(crocOptions)
if err != nil {
return
}
// save the config
saveConfig(c, crocOptions)
// if operating system is UNIX, then use environmental variable to set the code // if operating system is UNIX, then use environmental variable to set the code
if runtime.GOOS == "linux" { if runtime.GOOS == "linux" {
cr.Options.SharedSecret = os.Getenv("CROC_SECRET") log.Debug("forcing code phrase from environmental variable")
if cr.Options.SharedSecret == "" { crocOptions.SharedSecret = os.Getenv("CROC_SECRET")
if crocOptions.SharedSecret == "" {
fmt.Printf(`To use croc you need to set a code phrase using your environmental variables: fmt.Printf(`To use croc you need to set a code phrase using your environmental variables:
export CROC_SECRET="yourcodephrasetouse" export CROC_SECRET="yourcodephrasetouse"
@ -333,6 +326,14 @@ export CROC_SECRET="yourcodephrasetouse"
} }
} }
cr, err := croc.New(crocOptions)
if err != nil {
return
}
// save the config
saveConfig(c, crocOptions)
err = cr.Send(minimalFileInfos, emptyFoldersToTransfer, totalNumberFolders) err = cr.Send(minimalFileInfos, emptyFoldersToTransfer, totalNumberFolders)
return return
@ -525,6 +526,17 @@ func receive(c *cli.Context) (err error) {
return err return err
} }
} }
// if operating system is UNIX, then use environmental variable to set the code
if runtime.GOOS == "linux" {
crocOptions.SharedSecret = os.Getenv("CROC_SECRET")
if crocOptions.SharedSecret == "" {
fmt.Printf(`To use croc you need to set a code phrase using your environmental variables:
export CROC_SECRET="yourcodephrasetouse"
`)
os.Exit(0)
}
}
cr, err := croc.New(crocOptions) cr, err := croc.New(crocOptions)
if err != nil { if err != nil {
@ -548,18 +560,6 @@ func receive(c *cli.Context) (err error) {
log.Debugf("wrote %s", configFile) log.Debugf("wrote %s", configFile)
} }
// if operating system is UNIX, then use environmental variable to set the code
if runtime.GOOS == "linux" {
cr.Options.SharedSecret = os.Getenv("CROC_SECRET")
if cr.Options.SharedSecret == "" {
fmt.Printf(`To use croc you need to set a code phrase using your environmental variables:
export CROC_SECRET="yourcodephrasetouse"
`)
os.Exit(0)
}
}
err = cr.Receive() err = cr.Receive()
return return
} }