From 51a02fb414f66e79415bc917ae8d839da3f79ed4 Mon Sep 17 00:00:00 2001
From: Bartek Wrona <wrona@syncad.com>
Date: Fri, 17 Jul 2020 18:42:02 +0200
Subject: [PATCH] Improved database name normalization using branch name as an
input
---
scripts/ci_start_server.sh | 5 ++++-
scripts/ci_sync.sh | 4 +++-
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/scripts/ci_start_server.sh b/scripts/ci_start_server.sh
index 227283f63..1e11c4b46 100644
--- a/scripts/ci_start_server.sh
+++ b/scripts/ci_start_server.sh
@@ -9,7 +9,10 @@ HIVEMIND_HTTP_PORT=$4
PYTHONUSERBASE=./local-site
-DB_NAME=${HIVEMIND_DB_NAME/-/_}
+DB_NAME=${HIVEMIND_DB_NAME//-/_}
+DB_NAME=${DB_NAME//\[/_}
+DB_NAME=${DB_NAME//]/_}
+
DB_URL=$HIVEMIND_POSTGRESQL_CONNECTION_STRING/$DB_NAME
echo Attempting to start hive server listening on $HIVEMIND_HTTP_PORT port...
diff --git a/scripts/ci_sync.sh b/scripts/ci_sync.sh
index 06d6e9025..84d1422dd 100755
--- a/scripts/ci_sync.sh
+++ b/scripts/ci_sync.sh
@@ -9,7 +9,9 @@ HIVEMIND_MAX_BLOCK=$4
PYTHONUSERBASE=./local-site
-DB_NAME=${HIVEMIND_DB_NAME/-/_}
+DB_NAME=${HIVEMIND_DB_NAME//-/_}
+DB_NAME=${DB_NAME//\[/_}
+DB_NAME=${DB_NAME//]/_}
DB_URL=$HIVEMIND_POSTGRESQL_CONNECTION_STRING/$DB_NAME
echo Corrected db name $DB_NAME
echo Corrected db url $DB_URL
--
GitLab