From f6b33d314e5c62326ffc42521a5b78f4d671ce71 Mon Sep 17 00:00:00 2001 From: Ben Green Date: Sat, 2 Oct 2021 21:11:32 +0100 Subject: [PATCH 1/3] Bumping version to 1.0.16 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 758a46e..d941c12 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.0.15 \ No newline at end of file +1.0.16 \ No newline at end of file From 2c069fc901bfdb145fc45a4dd56b42aeb4102244 Mon Sep 17 00:00:00 2001 From: Ben Green Date: Sat, 2 Oct 2021 21:11:54 +0100 Subject: [PATCH 2/3] Changing installation check --- overlay/usr/lib/bf/freescout/setup-artisan | 4 ++-- overlay/usr/lib/bf/freescout/setup-config | 2 +- overlay/usr/lib/bf/freescout/setup-content | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/overlay/usr/lib/bf/freescout/setup-artisan b/overlay/usr/lib/bf/freescout/setup-artisan index 510ecf0..6be1e98 100644 --- a/overlay/usr/lib/bf/freescout/setup-artisan +++ b/overlay/usr/lib/bf/freescout/setup-artisan @@ -10,7 +10,7 @@ export BF_E=`basename ${0}` cd ${FREESCOUT_SRC} -if [ "${FREESCOUT_INSTALLED-}" -ne "1" ] ; then +if [ "${FREESCOUT_INSTALLED-}" != "1" ] ; then bf-debug "Generate key." php artisan key:generate fi @@ -26,7 +26,7 @@ php artisan config:clear bf-debug "Migrate database." php artisan migrate --force -if [ "${FREESCOUT_INSTALLED-}" -ne "1" ] ; then +if [ "${FREESCOUT_INSTALLED-}" != "1" ] ; then # ensure all required environment variables are set [[ -z "${FREESCOUT_ADMIN_FIRSTNAME-}" ]] && bf-error "FREESCOUT_ADMIN_FIRSTNAME must be set." diff --git a/overlay/usr/lib/bf/freescout/setup-config b/overlay/usr/lib/bf/freescout/setup-config index 4465777..fc68064 100644 --- a/overlay/usr/lib/bf/freescout/setup-config +++ b/overlay/usr/lib/bf/freescout/setup-config @@ -8,7 +8,7 @@ export BF_E=`basename ${0}` # If an existing installation was detected, do not proceed. #====================================================================================================================== -if [ "${FREESCOUT_INSTALLED-}" = "1" ] ; then +if [ "${FREESCOUT_INSTALLED-}" != "1" ] ; then bf-echo "Existing installation detected - do not regenerate .env." exit 0 fi diff --git a/overlay/usr/lib/bf/freescout/setup-content b/overlay/usr/lib/bf/freescout/setup-content index b63b13c..7ca578c 100644 --- a/overlay/usr/lib/bf/freescout/setup-content +++ b/overlay/usr/lib/bf/freescout/setup-content @@ -27,7 +27,7 @@ delete-if-not-link () { #====================================================================================================================== -# If /freescout already has content in it, delete source content so it can be linked to /freescout content... +# If /data already has content in it, delete source content so it can be linked to /freescout content... #====================================================================================================================== if [ "$(ls -A ${FREESCOUT})" ] ; then From 11d696519546510a712b9fa1eaa78978fc57d4bb Mon Sep 17 00:00:00 2001 From: Ben Green Date: Thu, 14 Oct 2021 17:59:45 +0100 Subject: [PATCH 3/3] Updating to FreeScout 1.7.18 --- FREESCOUT_REVISION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FREESCOUT_REVISION b/FREESCOUT_REVISION index 589d733..f8baa55 100644 --- a/FREESCOUT_REVISION +++ b/FREESCOUT_REVISION @@ -1 +1 @@ -1.7.17 \ No newline at end of file +1.7.18 \ No newline at end of file