From 1ac9e4f065ca05d5192c9e44e66c4b5b3a7434af Mon Sep 17 00:00:00 2001
From: John Brooks <john.brooks@dereferenced.net>
Date: Sun, 24 Sep 2017 16:56:05 -0600
Subject: [PATCH] cli: Use 'identity.json' by default

---
 .gitignore           | 2 +-
 ricochet-cli/main.go | 7 ++-----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 7316069..8015439 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
 ricochet-cli/ricochet-cli
-*.ricochet
+identity.json
diff --git a/ricochet-cli/main.go b/ricochet-cli/main.go
index 73821b7..38961cb 100644
--- a/ricochet-cli/main.go
+++ b/ricochet-cli/main.go
@@ -25,7 +25,7 @@ var (
 	unsafeBackend  bool
 	backendMode    bool
 	connectAuto    bool
-	configPath     string = "identity.ricochet"
+	configPath     string = "identity.json"
 	torAddress     string
 	torPassword    string
 )
@@ -33,7 +33,7 @@ var (
 func main() {
 	flag.Usage = func() {
 		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 -attach <address> [<args>]\n\tAttach to a client backend running on <address>\n", os.Args[0])
 		fmt.Fprintf(os.Stderr, "\nArgs:\n")
@@ -64,9 +64,6 @@ func main() {
 		} else if backendServer != "" {
 			fmt.Printf("Cannot use -listen with -attach, because attach implies not running a backend\n")
 			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 != "" {
 			fmt.Printf("Cannot use -tor-control with -attach, because tor connections happen on the backend\n")
 			os.Exit(1)