diff --git a/scripts/upgrade b/scripts/upgrade index 051c77b..87b8d5e 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -16,23 +16,12 @@ source /usr/share/yunohost/helpers email=$(ynh_user_get_info --username=$admin --key=mail) timezone="$(cat /etc/timezone)" -#================================================= -# CHECK VERSION -#================================================= - -upgrade_type=$(ynh_check_app_version_changed) - #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= +ynh_script_progression --message="Upgrading source files..." --weight=2 -if [ "$upgrade_type" == "UPGRADE_APP" ] -then - ynh_script_progression --message="Upgrading source files..." --weight=2 - - # Download, check integrity, uncompress and patch the source from app.src - ynh_setup_source --dest_dir="$install_dir" --keep="app/inc/config.php" -fi +ynh_setup_source --dest_dir="$install_dir" --keep="app/inc/config.php" chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir" @@ -42,10 +31,8 @@ chown -R $app:www-data "$install_dir" #================================================= ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=3 -# Create a dedicated PHP-FPM config ynh_add_fpm_config -# Create a dedicated NGINX config ynh_add_nginx_config #================================================= @@ -53,15 +40,12 @@ ynh_add_nginx_config #================================================= # UPDATE A CONFIG FILE #================================================= +ynh_script_progression --message="Updating a configuration file..." --weight=2 -if [ "$upgrade_type" == "UPGRADE_APP" ] -then - ynh_script_progression --message="Updating a configuration file..." --weight=2 +ynh_add_config --template="config.php" --destination="$install_dir/app/inc/config.php" - ynh_add_config --template="config.php" --destination="$install_dir/app/inc/config.php" - chmod 400 "$install_dir/app/inc/config.php" - chown $app:$app "$install_dir/app/inc/config.php" -fi +chmod 400 "$install_dir/app/inc/config.php" +chown $app:$app "$install_dir/app/inc/config.php" #================================================= # REPLACE LOGO IMAGE (DEFAULT IS FRAMADATE) @@ -78,16 +62,11 @@ touch "$install_dir/admin/stdout.log" #================================================= # RUN DATABASE UPGRADE #================================================= +ynh_script_progression --message="Upgrading database..." --weight=2 -if [ "$upgrade_type" == "UPGRADE_APP" ] -then - ynh_script_progression --message="Upgrading database..." --weight=2 +ynh_install_composer - # Install composer - ynh_install_composer - - ynh_exec_warn_less php$phpversion "$install_dir/admin/migration.php" -fi +ynh_exec_warn_less php$phpversion "$install_dir/admin/migration.php" chown -R $app: "$install_dir/"{tpl_c,admin/stdout.log}