RusstopiaLabs
/
xs
mirror of https://gogs.blitter.com/RLabs/xs
1
0
Fork 0
Code Issues Releases Wiki Activity

Improved flag.Usage() for cp/sh and removed more recursiveCopy flag remnants

This commit is contained in:
Russ Magee 2018-08-26 00:12:42 -07:00
parent 9025ee3c24
commit 6389ad49d5
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
hkexsh/hkexsh.go
View File

@ -260,6 +260,19 @@ func doShellMode(isInteractive bool, conn *hkexnet.Conn, oldState *hkexsh.State,
wg.Wait() wg.Wait()
} }
func UsageShell() {
fmt.Fprintf(os.Stderr, "Usage of %s:\n", os.Args[0])
fmt.Fprintf(os.Stderr, "%s [opts] [user]@server\n", os.Args[0])
flag.PrintDefaults()
}
func UsageCp() {
fmt.Fprintf(os.Stderr, "Usage of %s:\n", os.Args[0])
fmt.Fprintf(os.Stderr, "%s [opts] srcFileOrDir [...] [user]@server[:dstpath]\n", os.Args[0])
fmt.Fprintf(os.Stderr, "%s [opts] [user]@server[:srcFileOrDir] dstPath\n", os.Args[0])
flag.PrintDefaults()
}
// hkexsh - a client for secure shell and file copy operations. // hkexsh - a client for secure shell and file copy operations.
// //
// While conforming to the basic net.Conn interface HKex.Conn has extra // While conforming to the basic net.Conn interface HKex.Conn has extra
@ -282,7 +295,6 @@ func main() {
var port uint var port uint
var cmdStr string var cmdStr string
var recursiveCopy bool
var copySrc []byte var copySrc []byte
var copyDst string var copyDst string
@ -313,9 +325,9 @@ func main() {
// a srcpath (-r) or dstpath (-t) // a srcpath (-r) or dstpath (-t)
flag.StringVar(&cmdStr, "x", "", "`command` to run (if not specified run interactive shell)") flag.StringVar(&cmdStr, "x", "", "`command` to run (if not specified run interactive shell)")
shellMode = true shellMode = true
flag.Usage = UsageShell
} else { } else {
// Note: only makes sense for client->server copies flag.Usage = UsageCp
flag.BoolVar(&recursiveCopy, "r", false, "recursive copy/preserve tree copy")
} }
flag.Parse() flag.Parse()