diff --git a/src/cli/cli.go b/src/cli/cli.go index 2a9a900..92c458b 100644 --- a/src/cli/cli.go +++ b/src/cli/cli.go @@ -41,7 +41,10 @@ func Run() (err error) { app.Version = Version app.Compiled = time.Now() app.Usage = "easily and securely transfer stuff from one computer to another" - app.UsageText = `Send a file: + app.UsageText = `croc [GLOBAL OPTIONS] [COMMAND] [COMMAND OPTIONS] [filename(s) or folder] + + USAGE EXAMPLES: + Send a file: croc send file.txt -git to respect your .gitignore @@ -101,7 +104,7 @@ func Run() (err error) { &cli.BoolFlag{Name: "ask", Usage: "make sure sender and recipient are prompted"}, &cli.BoolFlag{Name: "local", Usage: "force to use only local connections"}, &cli.BoolFlag{Name: "ignore-stdin", Usage: "ignore piped stdin"}, - &cli.BoolFlag{Name: "overwrite", Usage: "do not prompt to overwrite"}, + &cli.BoolFlag{Name: "overwrite", Usage: "do not prompt to overwrite or resume"}, &cli.BoolFlag{Name: "testing", Usage: "flag for testing purposes"}, &cli.StringFlag{Name: "curve", Value: "p256", Usage: "choose an encryption curve (" + strings.Join(pake.AvailableCurves(), ", ") + ")"}, &cli.StringFlag{Name: "ip", Value: "", Usage: "set sender ip if known e.g. 10.0.0.1:9009, [::1]:9009"}, diff --git a/src/croc/croc.go b/src/croc/croc.go index e9cfda1..4dccf48 100644 --- a/src/croc/croc.go +++ b/src/croc/croc.go @@ -1775,9 +1775,9 @@ func (c *Client) updateIfRecipientHasFileInfo() (err error) { percentDone := 100 - float64(len(missingChunks)*models.TCP_BUFFER_SIZE/2)/float64(fileInfo.Size)*100 log.Debug("asking to overwrite") - prompt := fmt.Sprintf("\nOverwrite '%s'? (y/N) ", path.Join(fileInfo.FolderRemote, fileInfo.Name)) + prompt := fmt.Sprintf("\nOverwrite '%s'? (y/N) (use --overwrite to omit) ", path.Join(fileInfo.FolderRemote, fileInfo.Name)) if percentDone < 99 { - prompt = fmt.Sprintf("\nResume '%s' (%2.1f%%)? (y/N) ", path.Join(fileInfo.FolderRemote, fileInfo.Name), percentDone) + prompt = fmt.Sprintf("\nResume '%s' (%2.1f%%)? (y/N) (use --overwrite to omit) ", path.Join(fileInfo.FolderRemote, fileInfo.Name), percentDone) } choice := strings.ToLower(utils.GetInput(prompt)) if choice != "y" && choice != "yes" {