diff --git a/README.md b/README.md index e9f5c2c..aa783d5 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ In addition to Roundcube core features, the following are made available with th * Support for PGP encryption with Enigma plugin by default. -**Shipped version:** 1.6.0~ynh4 +**Shipped version:** 1.6.5~ynh1 **Demo:** https://demo.yunohost.org/webmail/ diff --git a/README_fr.md b/README_fr.md index 1d8017f..77686fc 100644 --- a/README_fr.md +++ b/README_fr.md @@ -29,7 +29,7 @@ En plus des fonctionnalités principales de Roundcube, les éléments suivants s * Prise en charge du chiffrement PGP avec le plugin Enigma installé par default. -**Version incluse :** 1.6.0~ynh4 +**Version incluse :** 1.6.5~ynh1 **Démo :** https://demo.yunohost.org/webmail/ diff --git a/conf/app.src b/conf/app.src index aefdce3..7b90fbd 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/roundcube/roundcubemail/releases/download/1.6.0/roundcubemail-1.6.0.tar.gz -SOURCE_SUM=1224eaf628888e503c49d0e8a69aa4997e566c3605738d0303d9c7a09722f363 +SOURCE_URL=https://github.com/roundcube/roundcubemail/releases/download/1.6.5/roundcubemail-1.6.5.tar.gz +SOURCE_SUM=6c830faa0674d917c426d9b694793743c51f8bf649cd6e7fc605957bcccd1730 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index 7b93bf6..07c73bb 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Open Source Webmail software", "fr": "Webmail Open Source" }, - "version": "1.6.0~ynh4", + "version": "1.6.5~ynh1", "url": "https://roundcube.net/", "upstream": { "license": "GPL-3.0-only", @@ -22,7 +22,7 @@ "email": "" }, "requirements": { - "yunohost": ">= 11.0.9" + "yunohost": ">= 11.2" }, "multi_instance": true, "services": [ diff --git a/scripts/upgrade b/scripts/upgrade index d05db8c..bbf726c 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -78,11 +78,11 @@ if [ -z "$with_carddav" ]; then ynh_app_setting_set --app=$app --key=with_carddav --value=$with_carddav fi - # If language doesn't exist, create it - if [ -z "$language" ]; then + # If language doesn't exist, create it + if [ -z "$language" ]; then language="en_GB" ynh_app_setting_set --app=$app --key=language --value=$language -fi +fi # If fpm_footprint doesn't exist, create it if [ -z "$fpm_footprint" ]; then @@ -261,8 +261,8 @@ then ynh_replace_string --match_string="^\s*// installed plugins" --replace_string="&\n $installed_plugins" --target_file="$final_path/config/config.inc.php" # Update JavaScript dependencies - (cd "$final_path" - /usr/bin/php$phpversion -q ./bin/update.sh -v ?) + pushd "$final_path" + COMPOSER_ALLOW_SUPERUSER=1 ./bin/update.sh --version="?" -y <<< "" # Store the config file checksum into the app settings ynh_store_file_checksum --file="$final_path/config/config.inc.php" @@ -275,8 +275,8 @@ then #================================================= ynh_script_progression --message="Updating $app core..." --weight=4 - ( cd "$final_path" - ynh_exec_warn ./bin/update.sh --version=$oldversion -y) + COMPOSER_ALLOW_SUPERUSER=1 ynh_exec_warn ./bin/update.sh --version=$oldversion -y + popd fi #=================================================