From 269911ab9865075d700fcab777e96d12de2231e7 Mon Sep 17 00:00:00 2001
From: Jae Kwon <jae@tendermint.com>
Date: Wed, 8 Jul 2015 13:09:47 -0700
Subject: [PATCH] barak -config, not barak -options-file

---
 INSTALL/README.md               |  2 +-
 cmd/barak/main.go               |  2 +-
 cmd/barak/{seed0 => seed}       |  0
 cmd/barak/seed1                 | 12 ------------
 cmd/barak/seed2                 | 12 ------------
 scripts/unsafe_upgrade_barak.sh |  2 +-
 6 files changed, 3 insertions(+), 27 deletions(-)
 rename cmd/barak/{seed0 => seed} (100%)
 delete mode 100644 cmd/barak/seed1
 delete mode 100644 cmd/barak/seed2

diff --git a/INSTALL/README.md b/INSTALL/README.md
index 79a692f5..9e02efbf 100644
--- a/INSTALL/README.md
+++ b/INSTALL/README.md
@@ -20,7 +20,7 @@ Don't use `apt-get install golang`, it's still on an old version.
 WARNING: THIS STEP WILL GIVE CONTROL OF THE CURRENT USER TO THE DEV TEAM.
 
     go get -u github.com/tendermint/tendermint/cmd/barak
-    nohup barak -options-file="$GOPATH/src/github.com/tendermint/tendermint/cmd/barak/seed0" &
+    nohup barak -config="$GOPATH/src/github.com/tendermint/tendermint/cmd/barak/seed" &
 
 ### Install/Update Tendermint
 
diff --git a/cmd/barak/main.go b/cmd/barak/main.go
index 1f07750d..0c70b4f8 100644
--- a/cmd/barak/main.go
+++ b/cmd/barak/main.go
@@ -39,7 +39,7 @@ var barak_ *Barak
 
 // Parse command-line options
 func parseFlags() (optionsFile string) {
-	flag.StringVar(&optionsFile, "options-file", "", "Read options from file instead of stdin")
+	flag.StringVar(&optionsFile, "config", "", "Read config from file instead of stdin")
 	flag.Parse()
 	return
 }
diff --git a/cmd/barak/seed0 b/cmd/barak/seed
similarity index 100%
rename from cmd/barak/seed0
rename to cmd/barak/seed
diff --git a/cmd/barak/seed1 b/cmd/barak/seed1
deleted file mode 100644
index 28af884e..00000000
--- a/cmd/barak/seed1
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "ListenAddress": "0.0.0.0:46661",
-    "Validators": [
-        {
-            "VotingPower": 1,
-            "PubKey": [1,"0A78709AF1FBB1118879E1C756834654E082A7C8240433FB9B22AB04710431A4"]
-        }
-    ],
-    "Registries": [
-        "http://navytoad.chaintest.net:46660"
-    ]
-}
diff --git a/cmd/barak/seed2 b/cmd/barak/seed2
deleted file mode 100644
index e9180ce9..00000000
--- a/cmd/barak/seed2
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "ListenAddress": "0.0.0.0:46662",
-    "Validators": [
-        {
-            "VotingPower": 1,
-            "PubKey": [1,"0A78709AF1FBB1118879E1C756834654E082A7C8240433FB9B22AB04710431A4"]
-        }
-    ],
-    "Registries": [
-        "http://navytoad.chaintest.net:46660"
-    ]
-}
diff --git a/scripts/unsafe_upgrade_barak.sh b/scripts/unsafe_upgrade_barak.sh
index 10ff8a84..be0abbb1 100755
--- a/scripts/unsafe_upgrade_barak.sh
+++ b/scripts/unsafe_upgrade_barak.sh
@@ -7,7 +7,7 @@ sleep 10
 debora --group default.upgrade close "[::]:46660"
 debora --group default.upgrade run -- bash -c "cd \$GOPATH/src/github.com/tendermint/tendermint; git pull origin develop; make"
 debora --group default.upgrade run -- bash -c "cd \$GOPATH/src/github.com/tendermint/tendermint; mkdir -p ~/.barak/logs"
-debora --group default.upgrade run --bg --label barak -- bash -c "cd \$GOPATH/src/github.com/tendermint/tendermint; barak --options-file=cmd/barak/seed0 | stdinwriter -outpath ~/.barak/logs/barak.log"
+debora --group default.upgrade run --bg --label barak -- bash -c "cd \$GOPATH/src/github.com/tendermint/tendermint; barak --config=cmd/barak/seed | stdinwriter -outpath ~/.barak/logs/barak.log"
 echo "Testing new barak..."
 debora list
 sleep 10