From bcf3212462360277bf15f8c39ded1a5e19647e13 Mon Sep 17 00:00:00 2001
From: Ethan Frey <ethanfrey@users.noreply.github.com>
Date: Tue, 30 May 2017 18:11:10 +0200
Subject: [PATCH] Fix up tendermint cli flags to 0.10.0-rc2 in demo

---
 cmd/commands/ibc.go | 8 ++++----
 demo/clean.sh       | 4 ++--
 demo/start.sh       | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/cmd/commands/ibc.go b/cmd/commands/ibc.go
index 01996d6076..8f1bdb4f56 100644
--- a/cmd/commands/ibc.go
+++ b/cmd/commands/ibc.go
@@ -139,7 +139,7 @@ func ibcRegisterTxCmd(cmd *cobra.Command, args []string) error {
 		return err
 	}
 
-	fmt.Println("IBCTx:", string(out))
+	fmt.Printf("IBCTx: %s\n", string(out))
 
 	data := []byte(wire.BinaryBytes(struct {
 		ibc.IBCTx `json:"unwrap"`
@@ -182,7 +182,7 @@ func ibcUpdateTxCmd(cmd *cobra.Command, args []string) error {
 	if err != nil {
 		return err
 	}
-	fmt.Println("IBCTx:", string(out))
+	fmt.Printf("IBCTx: %s\n", string(out))
 
 	data := []byte(wire.BinaryBytes(struct {
 		ibc.IBCTx `json:"unwrap"`
@@ -225,7 +225,7 @@ func ibcPacketCreateTxCmd(cmd *cobra.Command, args []string) error {
 	if err != nil {
 		return err
 	}
-	fmt.Println("IBCTx:", string(out))
+	fmt.Printf("IBCTx: %s\n", string(out))
 
 	data := []byte(wire.BinaryBytes(struct {
 		ibc.IBCTx `json:"unwrap"`
@@ -271,7 +271,7 @@ func ibcPacketPostTxCmd(cmd *cobra.Command, args []string) error {
 	if err != nil {
 		return err
 	}
-	fmt.Println("IBCTx:", string(out))
+	fmt.Printf("IBCTx: %s\n", string(out))
 
 	data := []byte(wire.BinaryBytes(struct {
 		ibc.IBCTx `json:"unwrap"`
diff --git a/demo/clean.sh b/demo/clean.sh
index e39f090eec..bffdefdb84 100644
--- a/demo/clean.sh
+++ b/demo/clean.sh
@@ -1,8 +1,8 @@
 #! /bin/bash
 
 killall -9 basecoin tendermint
-TMROOT=./data/chain1 tendermint unsafe_reset_all
-TMROOT=./data/chain2 tendermint unsafe_reset_all
+TMHOME=./data/chain1 tendermint unsafe_reset_all
+TMHOME=./data/chain2 tendermint unsafe_reset_all
 
 rm ./*.log
 
diff --git a/demo/start.sh b/demo/start.sh
index 490806fd62..d42e5ae11a 100644
--- a/demo/start.sh
+++ b/demo/start.sh
@@ -91,13 +91,13 @@ echo ""
 echo "... starting chains"
 echo ""
 # start the first node
-TMROOT=$BCHOME1 tendermint node --p2p.skip_upnp --log_level=info &> $LOG_DIR/chain1_tendermint.log &
+TMHOME=$BCHOME1 tendermint node --p2p.skip_upnp --log_level=info &> $LOG_DIR/chain1_tendermint.log &
 ifExit
 BCHOME=$BCHOME1 basecoin start --without-tendermint &> $LOG_DIR/chain1_basecoin.log &
 ifExit
 
 # start the second node
-TMROOT=$BCHOME2 tendermint node --p2p.skip_upnp --log_level=info --p2p.laddr tcp://localhost:36656 --rpc_laddr tcp://localhost:36657 --proxy_app tcp://localhost:36658 &> $LOG_DIR/chain2_tendermint.log &
+TMHOME=$BCHOME2 tendermint node --p2p.skip_upnp --log_level=info --p2p.laddr tcp://localhost:36656 --rpc.laddr tcp://localhost:36657 --proxy_app tcp://localhost:36658 &> $LOG_DIR/chain2_tendermint.log &
 ifExit
 BCHOME=$BCHOME2 basecoin start --address tcp://localhost:36658 --without-tendermint &> $LOG_DIR/chain2_basecoin.log &
 ifExit
@@ -124,7 +124,7 @@ echo "... creating egress packet on chain1"
 echo ""
 # send coins from chain1 to an address on chain2
 # TODO: dont hardcode the address
-basecoin tx send --amount 10mycoin $CHAIN_FLAGS1 --to $CHAIN_ID2/053BA0F19616AFF975C8756A2CBFF04F408B4D47 
+basecoin tx send --amount 10mycoin $CHAIN_FLAGS1 --to $CHAIN_ID2/053BA0F19616AFF975C8756A2CBFF04F408B4D47
 ifExit
 
 # alternative way to create packets (for testing)