From 688eb9dcb6bac43734c0bfd1c2119780470ea63e Mon Sep 17 00:00:00 2001
From: jash <jash@schulterklopfer-productions.de>
Date: Mon, 3 Dec 2018 18:52:00 +0100
Subject: [PATCH] bump :)

---
 dist/setup.sh | 37 +++++++++++++++++++++++++------------
 1 file changed, 25 insertions(+), 12 deletions(-)

diff --git a/dist/setup.sh b/dist/setup.sh
index 722cb69..b5aab68 100755
--- a/dist/setup.sh
+++ b/dist/setup.sh
@@ -79,6 +79,11 @@ next() {
     return $STEP_OK
 }
 
+#function finish {
+#
+#}
+#trap finish EXIT
+
 cowsay() {
 echo '
                      _____________________________________ 
@@ -99,7 +104,7 @@ echo '
 sudo_if_required() {
   if [[ $SUDO_REQUIRED == 1 && ! $(id -u) == 0 ]]; then
     try sudo $@
-  else 
+  else
     try $@
   fi
 }
@@ -138,7 +143,7 @@ configure() {
     recreate="recreate"
   fi
 
-  
+
 
   local arch=$(uname -m)
   local pw_env=''
@@ -162,10 +167,18 @@ configure() {
     clear && echo "Thinking..."
   fi
 
+  # before starting a new cyphernodeconf, kill all the others
+  local otherCyphernodeconf=$(docker ps | grep "cyphernodeconf" | awk '{ print $1 }');
+
+  if [[ ! ''$otherCyphernodeconf == '' ]]; then
+    docker rm -f $otherCyphernodeconf > /dev/null 2>&1
+  fi
+
   # configure features of cyphernode
   docker run -v $current_path:/data \
              -e DEFAULT_USER=$USER \
              --log-driver=none$pw_env \
+             --network none \
              --rm$interactive cyphernodeconf:latest $(id -u):$(id -g) yo --no-insight cyphernode$gen_options $recreate
   if [[ -f exitStatus.sh ]]; then
     . ./exitStatus.sh
@@ -195,7 +208,7 @@ copy_file() {
   if [[ ! -f $sourceFile ]]; then
     return 1;
   fi
-  
+
   if [[ -f $targetFile ]]; then
     ${sudo}cmp --silent $sourceFile $targetFile
     if [[ $? == 1 ]]; then
@@ -206,7 +219,7 @@ copy_file() {
         next
       fi
       doCopy=1
-    else 
+    else
       echo "identical $sourceFile == $targetFile"
     fi
   else
@@ -224,7 +237,7 @@ copy_file() {
 create_user() {
   #check if user exists
   if [[ ! $RUN_AS_USER == $USER ]]; then
-    id -u $RUN_AS_USER > /dev/null 2>&1 
+    id -u $RUN_AS_USER > /dev/null 2>&1
     if [[ $? == 1 ]]; then
       step "   create user $RUN_AS_USER "
       if [[ $(id -u) == 0 ]]; then
@@ -352,7 +365,7 @@ install_docker() {
     copy_file $sourceDataPath/gatekeeper/cert.pem $GATEKEEPER_DATAPATH/certs/cert.pem 1 $SUDO_REQUIRED
     copy_file $sourceDataPath/gatekeeper/key.pem $GATEKEEPER_DATAPATH/private/key.pem 1 $SUDO_REQUIRED
   fi
-  
+
   if [ ! -d $PROXY_DATAPATH ]; then
     step "   create $PROXY_DATAPATH"
     sudo_if_required mkdir -p $PROXY_DATAPATH
@@ -367,7 +380,7 @@ install_docker() {
     fi
     if [ -d $BITCOIN_DATAPATH ]; then
 
-      local cmpStatus=$(compare_bitcoinconf $sourceDataPath/bitcoin/bitcoin.conf $BITCOIN_DATAPATH/bitcoin.conf) 
+      local cmpStatus=$(compare_bitcoinconf $sourceDataPath/bitcoin/bitcoin.conf $BITCOIN_DATAPATH/bitcoin.conf)
 
       if [[ $cmpStatus == 'dataloss' ]]; then
         if [[ $ALWAYSYES == 1 ]]; then
@@ -511,11 +524,11 @@ sanity_checks() {
     RUN_AS_USER=$USER
   else
     local OS=$(uname -s)
-    id -u $RUN_AS_USER > /dev/null 2>&1 
+    id -u $RUN_AS_USER > /dev/null 2>&1
     if [[ $OS == 'Darwin' && $? == 1 ]]; then
       echo "          Automatic user creation not supported on OSX."
       echo "          Please create the user \"$RUN_AS_USER\" by hand and run: ./setup.sh -i"
-      exit  
+      exit
     fi
   fi
 
@@ -526,12 +539,12 @@ sanity_checks() {
     sudo=1
     sudo_reason='user'
   fi
-  
+
   if [[ $sudo == 0 ]]; then
     # we still don't need sudo. Let's check access to directories
     sudo=$(check_directory_owner)
     sudo_reason='directories'
-  fi 
+  fi
 
   if [[ $sudo == 1 ]]; then
     echo "    check Cyphernode installer has determined that it needs sudo to continue."
@@ -558,7 +571,7 @@ sanity_checks() {
 
       fi
       exit
-    else 
+    else
       SUDO_REQUIRED=1
     fi
   else