From 60dc90c871cf414df19a9327c08a7a8f56f71f9d Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 27 Dec 2020 17:55:50 +0100 Subject: [PATCH] Fix --- scripts/install | 5 ++--- scripts/upgrade | 10 +--------- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/scripts/install b/scripts/install index 405ae67..acaed30 100755 --- a/scripts/install +++ b/scripts/install @@ -104,6 +104,8 @@ ynh_script_progression --message="Installing Lychee with Composer..." --weight=1 # Install composer ynh_install_composer --phpversion="${YNH_PHP_VERSION}" --workdir="$final_path" --install_args="--prefer-source --no-dev" +ynh_exec_warn_less ynh_composer_exec update --lock + #================================================= # BUILDING #================================================= @@ -118,7 +120,6 @@ ynh_replace_string --match_string="__APP__" --replace_string="$app" --target_fil # setup application config pushd "$final_path" - php$phpversion artisan upgrade php$phpversion artisan key:generate -n --force --env php$phpversion artisan migrate -n --force php$phpversion artisan config:clear -n @@ -160,8 +161,6 @@ ynh_script_progression --message="Configuring SSOwat..." --weight=1 # Make app public if necessary or protect it if [ $is_public -eq 1 ] then - # Everyone can access the app. - # The "main" permission is automatically created before the install script. ynh_permission_update --permission "main" --add "visitors" fi diff --git a/scripts/upgrade b/scripts/upgrade index 2374dcf..75a8878 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -35,15 +35,6 @@ upgrade_type=$(ynh_check_app_version_changed) #================================================= ynh_script_progression --message="Ensuring downward compatibility..." --weight=1 -# Fix is_public as a boolean value -if [ "$is_public" = "Yes" ]; then - ynh_app_setting_set --app=$app --key=is_public --value=1 - is_public=1 -elif [ "$is_public" = "No" ]; then - ynh_app_setting_set --app=$app --key=is_public --value=0 - is_public=0 -fi - # If db_name doesn't exist, create it if [ -z "$db_name" ]; then db_name=$(ynh_sanitize_dbid --db_name=$app) @@ -131,6 +122,7 @@ ynh_script_progression --message="Installing Composer..." --weight=10 ynh_install_composer ynh_exec_warn_less ynh_composer_exec --commands=\"dump-autoload\" +ynh_exec_warn_less ynh_composer_exec update --lock pushd "$final_path" php$phpversion artisan migrate -n --force