schollz/croc
1
0
Fork 0
mirror of https://github.com/schollz/croc.git synced 2024-11-23 23:54:17 +03:00
Code Issues Projects Releases Wiki Activity

improve ux around receiving

Browse Source
This commit is contained in:
Zack 2024-05-23 08:27:52 -07:00
parent 6181903c83
commit ee713c5146
1 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/cli/cli.go
View File

@ -507,7 +507,26 @@ func receive(c *cli.Context) (err error) {
crocOptions.OnlyLocal = rememberedOptions.OnlyLocal
}
}
if crocOptions.SharedSecret == "" && os.Getenv("CROC_SECRET") != "" {
crocOptions.SharedSecret = os.Getenv("CROC_SECRET")
} else if runtime.GOOS == "linux" && crocOptions.SharedSecret != "" {
crocOptions.SharedSecret = os.Getenv("CROC_SECRET")
if crocOptions.SharedSecret == "" {
fmt.Printf(`On linux, to receive with croc you either need
to set a code phrase using your environmental variables:
export CROC_SECRET="****"
croc
Or you can specify the code phrase when you run croc without
declaring the secret on the command line:
croc
Enter receive code: ****
`)
os.Exit(0)
}
}
if crocOptions.SharedSecret == "" {
l, err := readline.NewEx(&readline.Config{
Prompt: "Enter receive code: ",
@ -526,17 +545,6 @@ func receive(c *cli.Context) (err error) {
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)
if err != nil {