From 6dbcf76fa290b8a8e942fc6d6dd81c4717da6512 Mon Sep 17 00:00:00 2001
From: Ethan Buchman <ethan@coinculture.info>
Date: Sun, 6 Sep 2015 17:03:20 +0000
Subject: [PATCH] dont exit on new, add ERISDB_API trigger

---
 DOCKER/chain_api.sh |  4 ----
 DOCKER/chain_new.sh | 11 ++++++-----
 DOCKER/chain_run.sh | 11 +++++++++--
 DOCKER/start.sh     |  2 --
 4 files changed, 15 insertions(+), 13 deletions(-)
 delete mode 100755 DOCKER/chain_api.sh

diff --git a/DOCKER/chain_api.sh b/DOCKER/chain_api.sh
deleted file mode 100755
index 8fecb978..00000000
--- a/DOCKER/chain_api.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#! /bin/bash
-
-echo "Running chain $CHAIN_ID (via ErisDB API)"
-erisdb $TMROOT
diff --git a/DOCKER/chain_new.sh b/DOCKER/chain_new.sh
index 6adc42f5..e696429a 100755
--- a/DOCKER/chain_new.sh
+++ b/DOCKER/chain_new.sh
@@ -26,11 +26,12 @@ else
 	cat $CHAIN_DIR/config.toml
 fi
 
-if [ "$RUN" = "true" ]; then
-	tendermint node
-	ifExit "Error starting tendermint"
+if [ $ERISDB_API ]; then
+	echo "Running chain $CHAIN_ID (via ErisDB API)"
+	erisdb $TMROOT
+	ifExit "Error starting erisdb"
 else
-	# this will just run for a second and quit
-	tendermint node & last_pid=$! && sleep 1 && kill -KILL $last_pid
+	echo Running chain $CHAIN_ID
+	tendermint node
 	ifExit "Error starting tendermint"
 fi
diff --git a/DOCKER/chain_run.sh b/DOCKER/chain_run.sh
index 7734f65e..6728d41c 100755
--- a/DOCKER/chain_run.sh
+++ b/DOCKER/chain_run.sh
@@ -1,4 +1,11 @@
 #! /bin/bash
 
-echo Running chain $CHAIN_ID
-tendermint node
+if [ $ERISDB_API ]; then
+	echo "Running chain $CHAIN_ID (via ErisDB API)"
+	erisdb $TMROOT
+	ifExit "Error starting erisdb"
+else
+	echo Running chain $CHAIN_ID
+	tendermint node
+	ifExit "Error starting tendermint"
+fi
diff --git a/DOCKER/start.sh b/DOCKER/start.sh
index b6888127..56516349 100755
--- a/DOCKER/start.sh
+++ b/DOCKER/start.sh
@@ -108,8 +108,6 @@ case $CMD in
 	;;
 "run" ) $ECM_PATH/chain_run.sh
 	;;
-"api" ) $ECM_PATH/chain_api.sh
-  ;;
 *)	echo "Enter a command for starting the chain (install, new, run, api)"
 	;;
 esac
-- 
GitLab