dan
/
ricochet-go
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cli: Use 'identity.json' by default

This commit is contained in:
John Brooks 2017-09-24 16:56:05 -06:00
parent d8a14fb4c5
commit 1ac9e4f065
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -1,2 +1,2 @@
ricochet-cli/ricochet-cli ricochet-cli/ricochet-cli
*.ricochet identity.json

7
ricochet-cli/main.go
View File

@ -25,7 +25,7 @@ var (
unsafeBackend bool unsafeBackend bool
backendMode bool backendMode bool
connectAuto bool connectAuto bool
configPath string = "identity.ricochet" configPath string = "identity.json"
torAddress string torAddress string
torPassword string torPassword string
) )
@ -33,7 +33,7 @@ var (
func main() { func main() {
flag.Usage = func() { flag.Usage = func() {
fmt.Fprintf(os.Stderr, "Usage:\n") fmt.Fprintf(os.Stderr, "Usage:\n")
fmt.Fprintf(os.Stderr, " %s [<args>] [<identity>]\n\tStandalone client using <identity> (default \"./identity.ricochet\")\n", os.Args[0]) fmt.Fprintf(os.Stderr, " %s [<args>] [<identity>]\n\tStandalone client using <identity> (default \"./%s\")\n", os.Args[0], configPath)
fmt.Fprintf(os.Stderr, " %s -listen <address> [<args>] [<identity>]\n\tListen on <address> for Ricochet client frontend connections\n", os.Args[0]) fmt.Fprintf(os.Stderr, " %s -listen <address> [<args>] [<identity>]\n\tListen on <address> for Ricochet client frontend connections\n", os.Args[0])
fmt.Fprintf(os.Stderr, " %s -attach <address> [<args>]\n\tAttach to a client backend running on <address>\n", os.Args[0]) fmt.Fprintf(os.Stderr, " %s -attach <address> [<args>]\n\tAttach to a client backend running on <address>\n", os.Args[0])
fmt.Fprintf(os.Stderr, "\nArgs:\n") fmt.Fprintf(os.Stderr, "\nArgs:\n")
@ -64,9 +64,6 @@ func main() {
} else if backendServer != "" { } else if backendServer != "" {
fmt.Printf("Cannot use -listen with -attach, because attach implies not running a backend\n") fmt.Printf("Cannot use -listen with -attach, because attach implies not running a backend\n")
os.Exit(1) os.Exit(1)
} else if configPath != "identity.ricochet" {
fmt.Printf("Cannot use -identity with -attach, because identity is stored at the backend\n")
os.Exit(1)
} else if torAddress != "" || torPassword != "" { } else if torAddress != "" || torPassword != "" {
fmt.Printf("Cannot use -tor-control with -attach, because tor connections happen on the backend\n") fmt.Printf("Cannot use -tor-control with -attach, because tor connections happen on the backend\n")
os.Exit(1) os.Exit(1)