Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

v1.0.16 #17

Merged
merged 3 commits into from
Oct 14, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion FREESCOUT_REVISION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.7.17
1.7.18
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.0.15
1.0.16
4 changes: 2 additions & 2 deletions overlay/usr/lib/bf/freescout/setup-artisan
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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."
Expand Down
2 changes: 1 addition & 1 deletion overlay/usr/lib/bf/freescout/setup-config
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion overlay/usr/lib/bf/freescout/setup-content
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down