From e7fd886c38fc1d0031095b19c312b57f720cd2f8 Mon Sep 17 00:00:00 2001
From: mazano <addloe@gmail.com>
Date: Tue, 20 Dec 2022 17:43:58 +0200
Subject: [PATCH] minor tweaks (#401)

---
 .example.env        |  2 +-
 build.sh            | 24 ++++++++++++++----------
 scripts/env-data.sh |  2 +-
 3 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/.example.env b/.example.env
index 37eb315..37dad81 100644
--- a/.example.env
+++ b/.example.env
@@ -16,4 +16,4 @@ LANGS="en_US.UTF-8,id_ID.UTF-8"
 POSTGRES_MAJOR_VERSION=15
 POSTGIS_MAJOR_VERSION=3
 POSTGIS_MINOR_RELEASE=3
-BUILD_TIMESCALE=true
\ No newline at end of file
+BUILD_TIMESCALE=false
\ No newline at end of file
diff --git a/build.sh b/build.sh
index 0b081cd..6434fbe 100755
--- a/build.sh
+++ b/build.sh
@@ -4,15 +4,19 @@ if [[ ! -f .env ]]; then
     echo "Default build arguments don't exists. Creating one from default value."
     cp .example.env .env
 fi
+source .env
+
+if [[ ${BUILD_TIMESCALE} =~ [Ff][Aa][Ll][Ss][Ee] ]];then
+  if [[ $(dpkg -l | grep "docker-compose") > /dev/null ]];then
+    docker-compose -f docker-compose.build.yml build postgis-prod
+  else
+    docker compose -f docker-compose.build.yml build postgis-prod
+  fi
 
-if [[ $(dpkg -l | grep "docker-compose") > /dev/null ]];then
-  docker-compose -f docker-compose.build.yml build postgis-prod
 else
-  docker compose -f docker-compose.build.yml build postgis-prod
-fi
-
-#if [[ $(dpkg -l | grep "docker-compose") > /dev/null ]];then
-  #docker-compose -f docker-compose.build-timescale.yml build postgis-prod
-#else
-  #docker compose -f docker-compose.build-timescale.yml build postgis-prod
-#fi
+  if [[ $(dpkg -l | grep "docker-compose") > /dev/null ]];then
+  docker-compose -f docker-compose.build-timescale.yml build postgis-prod
+  else
+  docker compose -f docker-compose.build-timescale.yml build postgis-prod
+  fi
+fi
\ No newline at end of file
diff --git a/scripts/env-data.sh b/scripts/env-data.sh
index 47ca817..2fe3046 100644
--- a/scripts/env-data.sh
+++ b/scripts/env-data.sh
@@ -78,7 +78,7 @@ fi
 
 function generate_random_string() {
   STRING_LENGTH=$1
-  random_pass_string=$(openssl rand -base64 ${STRING_LENGTH})
+  random_pass_string=$(cat /dev/urandom | tr -dc '[:alnum:]' | head -c "${STRING_LENGTH}")
   if [[ ! -f /scripts/.pass_${STRING_LENGTH}.txt ]]; then
     echo ${random_pass_string} > /scripts/.pass_${STRING_LENGTH}.txt
   fi