From 8d34685aaa43ff04e139fe3c18798b1c269c973b Mon Sep 17 00:00:00 2001 From: Deon George Date: Mon, 24 May 2021 15:39:07 +1000 Subject: [PATCH] Changed dev to local, since laravel uses local for non-production deployments --- init | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/init b/init index 283223a..c138e3b 100755 --- a/init +++ b/init @@ -46,7 +46,7 @@ if [ "${role}" = "app" -a -e artisan ]; then # Only adjust perms if this is an external mountpoint if [ ${mp} -eq 0 -o -n "${FORCE_PERMS}" ] ; then - if [ -n "${FORCE_PERMS}" -o "${env}" != "dev" -a -z "${SKIP_PERM}" ]; then + if [ -n "${FORCE_PERMS}" -o "${env}" != "local" -a -z "${SKIP_PERM}" ]; then echo "* Setting Permissions..." # Make sure our permissions are appropraite find ${php} -type f -exec chmod 640 {} \; @@ -63,20 +63,20 @@ if [ "${role}" = "app" -a -e artisan ]; then # See if we need to refresh our dependancies if [[ -r composer.json && ( -e .composer.refresh || ! -d vendor ) ]]; then rm -f ${php}/bootstrap/cache/*.php - if [ "${env}" != "dev" ]; then + if [ "${env}" != "local" ]; then NODEV="--no-dev" fi mp=$(mp ${composer}) if [ ${mp} -eq 0 -o -n "${FORCE_PERMS}" ] ; then - [ -n "${FORCE_PERMS}" -o "${env}" != "dev" -a -z "${SKIP_PERM}" ] && chown -R www-data:www-data ${composer} + [ -n "${FORCE_PERMS}" -o "${env}" != "local" -a -z "${SKIP_PERM}" ] && chown -R www-data:www-data ${composer} [ ! -d ${php}/vendor ] && mkdir -m 750 ${php}/vendor && chown www-data:www-data ${php}/vendor - [ -n "${FORCE_PERMS}" -o "${env}" != "dev" -a -z "${SKIP_PERM}" ] && chmod g+w ${php} + [ -n "${FORCE_PERMS}" -o "${env}" != "local" -a -z "${SKIP_PERM}" ] && chmod g+w ${php} fi su www-data -s /bin/sh -c "composer install --optimize-autoloader ${NODEV}" && ( test -e .composer.refresh && rm -f .composer.refresh ) - [ -n "${FORCE_PERMS}" -o "${env}" != "dev" -a -z "${SKIP_PERM}" ] && [ ${mp} -eq 0 ] && chmod g-w ${php} + [ -n "${FORCE_PERMS}" -o "${env}" != "local" -a -z "${SKIP_PERM}" ] && [ ${mp} -eq 0 ] && chmod g-w ${php} fi if [ -e .lumen ]; then @@ -126,7 +126,7 @@ elif [ "$role" = "queue" -a -e artisan ]; then fi QUEUE_CMD=work - if [ "${env}" == "dev" ]; then + if [ "${env}" == "local" ]; then QUEUE_CMD=listen fi