From adfacab563b7a571c8b868b21495445f7be2ecfc Mon Sep 17 00:00:00 2001
From: Benjamin Bollen <ben@erisindustries.com>
Date: Thu, 12 May 2016 00:10:19 +0200
Subject: [PATCH] SQUASH default to CHAIN_DIR over TMROOT

---
 DOCKER/Dockerfile                | 2 +-
 DOCKER/chain_api.sh              | 2 +-
 DOCKER/chain_new.sh              | 2 +-
 DOCKER/chain_run.sh              | 2 +-
 DOCKER/start.sh                  | 2 +-
 net_test/data/init.sh            | 2 +-
 net_test/data/net_test_0/init.sh | 2 +-
 net_test/data/net_test_1/init.sh | 2 +-
 net_test/data/net_test_2/init.sh | 2 +-
 net_test/data/net_test_3/init.sh | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/DOCKER/Dockerfile b/DOCKER/Dockerfile
index 932d674d..016d2357 100644
--- a/DOCKER/Dockerfile
+++ b/DOCKER/Dockerfile
@@ -73,7 +73,7 @@ USER $USER
 RUN mkdir --parents /home/$USER/.eris/chains/tendermint
 ENV TMROOT /home/$USER/.eris/chains/tendermint
 
-# run tendermint
+# run eris-db
 # ports: 1337:eris-db API; 46656:tendermint-peer; 46657:tendermint-rpc
 EXPOSE 1337
 EXPOSE 46656
diff --git a/DOCKER/chain_api.sh b/DOCKER/chain_api.sh
index 8fecb978..26a96ffd 100755
--- a/DOCKER/chain_api.sh
+++ b/DOCKER/chain_api.sh
@@ -1,4 +1,4 @@
 #! /bin/bash
 
 echo "Running chain $CHAIN_ID (via ErisDB API)"
-erisdb $TMROOT
+erisdb $CHAIN_DIR
diff --git a/DOCKER/chain_new.sh b/DOCKER/chain_new.sh
index a487564a..caa327ef 100755
--- a/DOCKER/chain_new.sh
+++ b/DOCKER/chain_new.sh
@@ -33,7 +33,7 @@ fi
 # tendermint node & last_pid=$! && sleep 1 && kill -KILL $last_pid
 if [ $ERISDB_API ]; then
 	echo "Running chain $CHAIN_ID (via ErisDB API)"
-	erisdb $TMROOT
+	erisdb $CHAIN_DIR
 	ifExit "Error starting erisdb"
 else
 	echo Running chain $CHAIN_ID
diff --git a/DOCKER/chain_run.sh b/DOCKER/chain_run.sh
index 6728d41c..7a14e574 100755
--- a/DOCKER/chain_run.sh
+++ b/DOCKER/chain_run.sh
@@ -2,7 +2,7 @@
 
 if [ $ERISDB_API ]; then
 	echo "Running chain $CHAIN_ID (via ErisDB API)"
-	erisdb $TMROOT
+	erisdb $CHAIN_DIR
 	ifExit "Error starting erisdb"
 else
 	echo Running chain $CHAIN_ID
diff --git a/DOCKER/start.sh b/DOCKER/start.sh
index 7f3194e5..c15b1f3c 100755
--- a/DOCKER/start.sh
+++ b/DOCKER/start.sh
@@ -41,7 +41,7 @@ fi
 CHAIN_DIR="/home/$USER/.eris/chains/$CHAIN_ID"
 
 # set the tendermint directory
-TMROOT=$CHAIN_DIR
+TMROOT="$CHAIN_DIR"/tendermint
 
 if [ ! -d "$CHAIN_DIR" ]; then
 	mkdir -p $CHAIN_DIR
diff --git a/net_test/data/init.sh b/net_test/data/init.sh
index 28c329fe..2020d318 100755
--- a/net_test/data/init.sh
+++ b/net_test/data/init.sh
@@ -9,4 +9,4 @@ git fetch origin $BRANCH
 git checkout $BRANCH
 go install ./cmd/erisdb
 
-erisdb $TMROOT # should be exposed by docker file
+erisdb $CHAIN_DIR # should be exposed by docker file
diff --git a/net_test/data/net_test_0/init.sh b/net_test/data/net_test_0/init.sh
index 28c329fe..2020d318 100755
--- a/net_test/data/net_test_0/init.sh
+++ b/net_test/data/net_test_0/init.sh
@@ -9,4 +9,4 @@ git fetch origin $BRANCH
 git checkout $BRANCH
 go install ./cmd/erisdb
 
-erisdb $TMROOT # should be exposed by docker file
+erisdb $CHAIN_DIR # should be exposed by docker file
diff --git a/net_test/data/net_test_1/init.sh b/net_test/data/net_test_1/init.sh
index 28c329fe..2020d318 100755
--- a/net_test/data/net_test_1/init.sh
+++ b/net_test/data/net_test_1/init.sh
@@ -9,4 +9,4 @@ git fetch origin $BRANCH
 git checkout $BRANCH
 go install ./cmd/erisdb
 
-erisdb $TMROOT # should be exposed by docker file
+erisdb $CHAIN_DIR # should be exposed by docker file
diff --git a/net_test/data/net_test_2/init.sh b/net_test/data/net_test_2/init.sh
index 28c329fe..2020d318 100755
--- a/net_test/data/net_test_2/init.sh
+++ b/net_test/data/net_test_2/init.sh
@@ -9,4 +9,4 @@ git fetch origin $BRANCH
 git checkout $BRANCH
 go install ./cmd/erisdb
 
-erisdb $TMROOT # should be exposed by docker file
+erisdb $CHAIN_DIR # should be exposed by docker file
diff --git a/net_test/data/net_test_3/init.sh b/net_test/data/net_test_3/init.sh
index 28c329fe..2020d318 100755
--- a/net_test/data/net_test_3/init.sh
+++ b/net_test/data/net_test_3/init.sh
@@ -9,4 +9,4 @@ git fetch origin $BRANCH
 git checkout $BRANCH
 go install ./cmd/erisdb
 
-erisdb $TMROOT # should be exposed by docker file
+erisdb $CHAIN_DIR # should be exposed by docker file
-- 
GitLab