diff --git a/scripts/upgrade b/scripts/upgrade index 8625bca..5c92518 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -61,30 +61,26 @@ if [ "$upgrade_type" == "UPGRADE_APP" ] then ynh_script_progression --message="Upgrading source files..." --weight=1 - # Create a temporary directory - tmpdir="$(mktemp -d)" + # # Create a temporary directory + # tmpdir="$(mktemp -d)" - # Backup the config file in the temp dir - cp -a "$final_path/.env" "$tmpdir/.env" + # # Backup the config file in the temp dir + # cp -a "$final_path/.env" "$tmpdir/.env" # Remove the app directory securely #ynh_secure_remove --file="$final_path" # Download, check integrity, uncompress and patch the source from app.src - ynh_setup_source --dest_dir="$final_path" + ynh_setup_source --dest_dir="$final_path" --keep="$final_path/.env" - # Copy the admin saved settings from tmp directory to final path - cp -a "$tmpdir/.env" "$final_path/.env" + # # Copy the admin saved settings from tmp directory to final path + # cp -a "$tmpdir/.env" "$final_path/.env" - # Remove the tmp directory securely - ynh_secure_remove --file="$tmpdir" + # # Remove the tmp directory securely + # ynh_secure_remove --file="$tmpdir" fi -# Set permissions on app files -chmod 755 $final_path -chmod -R o-rwx $final_path -chown -R $app:www-data $final_path -chmod 600 $final_path/.env + #================================================= # NGINX CONFIGURATION @@ -108,7 +104,7 @@ ynh_add_fpm_config --package="$extra_php_dependencies" ynh_script_progression --message="Installing BookStack with Composer..." --weight=5 # Install composer -ynh_install_composer --phpversion=$phpversion --workdir=$final_path --install_args="--no-dev" +ynh_install_composer #--phpversion=$phpversion --workdir=$final_path --install_args="--no-dev" #================================================= # FINAL BOOKSTACK INSTALL @@ -116,11 +112,17 @@ ynh_install_composer --phpversion=$phpversion --workdir=$final_path --install_ar ynh_script_progression --message="Install BookStack" --weight=5 pushd $final_path - php$phpversion artisan migrate --no-interaction \ - && php$phpversion artisan cache:clear --no-interaction \ - && php$phpversion artisan view:clear --no-interaction + php$phpversion artisan migrate --no-interaction + php$phpversion artisan cache:clear --no-interaction + php$phpversion artisan view:clear --no-interaction popd +# Set permissions on app files +chmod 755 $final_path +chmod -R o-rwx $final_path +chown -R $app:www-data $final_path +chmod 600 $final_path/.env + #================================================= # RELOAD NGINX #=================================================