From b3a8c5cd7dbb5defbd92b9923ca194e5fba1879c Mon Sep 17 00:00:00 2001 From: jaybuidl Date: Fri, 18 Aug 2023 02:21:58 +0200 Subject: [PATCH] fix: smol bug --- web/scripts/runEnv.sh | 7 +++++-- web/src/layout/Header/navbar/Debug.tsx | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/web/scripts/runEnv.sh b/web/scripts/runEnv.sh index a64063790..144031c79 100755 --- a/web/scripts/runEnv.sh +++ b/web/scripts/runEnv.sh @@ -18,6 +18,9 @@ if [[ ! " ${valid_deployments[@]} " =~ " ${deployment} " ]]; then fi node $SCRIPT_DIR/gitInfo.js -. $SCRIPT_DIR/../.env.${deployment}.public -. $SCRIPT_DIR/../.env.${deployment} + +envFile="$SCRIPT_DIR/../.env.${deployment}" +[ -f "$envFile.public" ] && . $envFile.public +[ -f "$envFile" ] && . $envFile + eval "$commands" diff --git a/web/src/layout/Header/navbar/Debug.tsx b/web/src/layout/Header/navbar/Debug.tsx index 253deab24..a8333db56 100644 --- a/web/src/layout/Header/navbar/Debug.tsx +++ b/web/src/layout/Header/navbar/Debug.tsx @@ -37,7 +37,7 @@ const Phase = () => { }); return ( <> - {phase && ( + {phase !== undefined && (