From 57e87d40967408b0553c89423add59fb7545ca77 Mon Sep 17 00:00:00 2001
From: Maurice Faber <maurice.faber@redkubes.com>
Date: Tue, 31 Aug 2021 16:27:10 +0200
Subject: [PATCH] fix: typo, env loader [ci skip]

---
 bin/loadenv         | 11 +++++++++++
 binzx/otomi         |  7 +++++--
 src/server/index.ts |  2 +-
 3 files changed, 17 insertions(+), 3 deletions(-)
 create mode 100644 bin/loadenv

diff --git a/bin/loadenv b/bin/loadenv
new file mode 100644
index 0000000000..b9a1f300b8
--- /dev/null
+++ b/bin/loadenv
@@ -0,0 +1,11 @@
+#!/bin/bash
+. bin/aliases
+
+if [ -z "$ENV_DIR" ]; then
+  echo "You did not set ENV_DIR yet!"
+else
+  set -a
+  PATH=./binzx:$PATH
+  source $ENV_DIR/.secrets
+  set +a
+fi
diff --git a/binzx/otomi b/binzx/otomi
index 32d06f36c8..7988e60d29 100755
--- a/binzx/otomi
+++ b/binzx/otomi
@@ -277,14 +277,17 @@ fi
 
 mkdir -p /tmp/otomi
 container_name='otomi-core-dev-container'
+count=$(ps -a | grep $container_name | wc -l) >/dev/null
+container_name="$container_name-$count"
+
 if [ -n "$IN_DOCKER" ]; then
   $cmd
   status=$?
 elif [[ $calling_args == *'--get-yargs-completions'* ]]; then
-  docker run --name $container_name -e SHELL=$SHELL "$otomi_tools_image" bash -c "$cmd"
+  docker run --name $container_name --rm -e SHELL=$SHELL "$otomi_tools_image" bash -c "$cmd"
   status=$?
 else
-  docker run --name $container_name --init $it \
+  docker run --name $container_name --rm --init $it \
     $linux_workaround \
     $network \
     $stack_volume \
diff --git a/src/server/index.ts b/src/server/index.ts
index aeda5c4ae5..bf9ca98f0d 100644
--- a/src/server/index.ts
+++ b/src/server/index.ts
@@ -9,7 +9,7 @@ import { terminal } from '../common/utils'
 
 const debug = terminal('server')
 const app = express()
-let server: Server§
+let server: Server
 
 export const stopServer = (): void => {
   server?.close()