diff --git a/README.md b/README.md index 57b007a..a7cd47e 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ It extracts content so that you can read it when you have time. It provides a web interface, browser (Firefox / Chrome / Opera) add-ons, mobile apps (Android / iOS / Windows Phone) and even on e-reader (PocketBook / Kobo). -**Shipped version:** 2.3.8 +**Shipped version:** 2.4.2 ## Screenshots diff --git a/README_fr.md b/README_fr.md index d47f30e..00b0cb0 100644 --- a/README_fr.md +++ b/README_fr.md @@ -14,7 +14,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour Sont disponibles une interface web, des add-ons pour navigateurs (Firefox / Chrome / Opera), des applications pour mobile (Android / iOS / Windows Phone) et même sur liseuse (PocketBook / Kobo). -**Version incluse:** 2.3.8 +**Version incluse:** 2.4.2 ## Captures d'écran diff --git a/conf/app.src b/conf/app.src index 4ab2afd..41bda61 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://static.wallabag.org/releases/wallabag-release-2.3.8.tar.gz -SOURCE_SUM=58f319ee41828fcc4fd00a14c4ac7c16b2179a47af21e257a15938311d1426eb +SOURCE_URL=https://static.wallabag.org/releases/wallabag-release-2.4.2.tar.gz +SOURCE_SUM=da56ec37ed3d78a4b4132e8a248ac4997442eefaad6f831805304a8c317569d8 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index af4a8cd..2d4dfd5 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "A self hostable read-it-later app", "fr": "Une application de lecture-plus-tard auto-hébergeable" }, - "version": "2.3.8~ynh3", + "version": "2.4.2~ynh1", "url": "https://www.wallabag.org", "license": "MIT", "maintainer": { diff --git a/scripts/change_url b/scripts/change_url index 7db3313..b49b957 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -84,9 +84,6 @@ fi #================================================= ynh_script_progression --message="Updating wallabag configuration..." -# Configure Wallabag instance URL -ynh_mysql_connect_as --user=$db_user --password="$db_pwd" --database=$db_name <<< "UPDATE craue_config_setting SET value = 'https://$new_domain$new_path' WHERE name = 'wallabag_url'" - # Change domain name in parameters.yml ynh_replace_string --match_string="domain_name: .*" --replace_string="domain_name: https://$new_domain$new_path" --target_file=$final_path/app/config/parameters.yml diff --git a/scripts/install b/scripts/install index 8867d0f..ab4ea3c 100644 --- a/scripts/install +++ b/scripts/install @@ -141,9 +141,6 @@ done # Set admin user $php_exec fos:user:promote --super "$admin" -# Configure Wallabag instance URL -ynh_mysql_connect_as --user=$db_user --password="$db_pwd" --database=$db_name <<< "UPDATE craue_config_setting SET value = 'https://$domain$path_url' WHERE name = 'wallabag_url'" - #================================================= # CONFIGURE FAIL2BAN #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 94bc0d9..779a2dc 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -172,7 +172,7 @@ then #================================================= # Alias for php-cli execution command - php_exec="ynh_exec_as $app php "$final_path/bin/console" --no-interaction --env=prod" + php_exec="ynh_exec_as $app php "$final_path/bin/console" --no-interaction --env prod" # Set permissions to app files chown -R $app: $final_path @@ -181,8 +181,14 @@ then $php_exec doctrine:migrations:migrate $php_exec cache:clear - # Configure Wallabag instance URL - ynh_mysql_connect_as --user=$db_user --password="$db_pwd" --database=$db_name <<< "UPDATE craue_config_setting SET value = 'https://$domain$path_url' WHERE name = 'wallabag_url'" + current_upstream_version="$(ynh_app_upstream_version --manifest="/etc/yunohost/apps/$YNH_APP_INSTANCE_NAME/manifest.json")" + if dpkg --compare-versions "2.4.2" gt "$current_upstream_version"; then + ynh_script_progression --message="Ensuring upgrade compatibility to Wallabag 2.4.x..." + + # Generate hashed URLs for faster check + # TODO does it take much time... ? + $php_exec wallabag:generate-hashed-urls + fi fi #=================================================