From 575ae2beae189e9d4e944a724a163631d65a927c Mon Sep 17 00:00:00 2001 From: Benoit Lavenier Date: Fri, 17 Jul 2020 16:31:39 +0200 Subject: [PATCH] Minor changes --- arch/windows/splash.html | 4 ++-- release.sh | 11 ++++++++++- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/arch/windows/splash.html b/arch/windows/splash.html index a7f305e..838bc51 100644 --- a/arch/windows/splash.html +++ b/arch/windows/splash.html @@ -19,8 +19,8 @@ - + diff --git a/release.sh b/release.sh index f87fcf6..db4e320 100755 --- a/release.sh +++ b/release.sh @@ -30,7 +30,16 @@ if [[ -z $TAG ]]; then exit 1 fi -# Force nodejs version to 6 +# Override with a local file, if any +if [[ -f "${ROOT}/.local/env.sh" ]]; then + echo "Loading environment variables from: '.local/env.sh'" + source ${ROOT}/.local/env.sh + [[ $? -ne 0 ]] && exit 1 +else + echo "No file '${ROOT}/.local/env.sh' found. Will use defaults" +fi + +# Force nodejs version if [[ -d "${NVM_DIR}" ]]; then . ${NVM_DIR}/nvm.sh nvm use ${NODEJS_VERSION} -- GitLab