diff --git a/README.md b/README.md index 4d293b1..110916e 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in ## Overview Open source constituent relationship management (CRM) for non-profits, NGOs and advocacy organizations. -**Shipped version:** 5.26.1 on Drupal 7 +**Shipped version:** 5.30.1 on Drupal 7 ## Screenshots diff --git a/README_fr.md b/README_fr.md index 19a9c37..509bbe4 100644 --- a/README_fr.md +++ b/README_fr.md @@ -11,7 +11,7 @@ Si vous n'avez pas YunoHost, consultez [le guide](https://yunohost.org/#/install ## Vue d'ensemble Gestion des relations avec les constituants (GRC/CRM) pour les organisations à but non lucratif, les ONG et les organisations de défense des droits. -**Version incluse:** 5.26.1 et Drupal 7 +**Version incluse:** 5.30.1 et Drupal 7 ## Captures d'écran diff --git a/conf/civicrm-drupal.src b/conf/civicrm-drupal.src index 4b39651..c0ed4c5 100644 --- a/conf/civicrm-drupal.src +++ b/conf/civicrm-drupal.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://storage.googleapis.com/civicrm/civicrm-stable/5.26.1/civicrm-5.26.1-drupal.tar.gz -SOURCE_SUM=7b02566bfcf885d04c8428ab4da381881dd3846eedf8535e746d5855df1b7425 +SOURCE_URL=https://storage.googleapis.com/civicrm/civicrm-stable/5.30.1/civicrm-5.30.1-drupal.tar.gz +SOURCE_SUM=47b7c90c7e941e7b1c56c599026bb7d8c6b4582e31bb28324b5fff243eeb4be5 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/conf/civicrm-l10n.src b/conf/civicrm-l10n.src index 2206a0e..2ba4023 100644 --- a/conf/civicrm-l10n.src +++ b/conf/civicrm-l10n.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://storage.googleapis.com/civicrm/civicrm-stable/5.26.1/civicrm-5.26.1-l10n.tar.gz -SOURCE_SUM=f1a5b3224989a919d8f60e7b842ebf49551cf6ef880475ae2c0cbb24f0397706 +SOURCE_URL=https://storage.googleapis.com/civicrm/civicrm-stable/5.30.1/civicrm-5.30.1-l10n.tar.gz +SOURCE_SUM=130758ce8e611f18a055e4882c79b8fb092c99f1de9ac7da9e40bd5b2137824e SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index c2d5db6..8962bf0 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "CRM for non-profits, NGOs and advocacy organizations.", "fr": "CRM pour organisations à but non lucratif et ONG." }, - "version": "5.26.1-7.0~ynh1", + "version": "5.30.1-7.0~ynh1", "url": "https://civicrm.org", "license": "AGPL-3.0-or-later", "maintainer": { diff --git a/scripts/install b/scripts/install index 6d0a97d..5de9ace 100644 --- a/scripts/install +++ b/scripts/install @@ -7,7 +7,7 @@ #================================================= source _common.sh -source ynh_composer__2 +source ynh_composer__3 source /usr/share/yunohost/helpers #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 7d25717..d03ad1d 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -7,7 +7,7 @@ #================================================= source _common.sh -source ynh_composer__2 +source ynh_composer__3 source /usr/share/yunohost/helpers #================================================= diff --git a/scripts/ynh_composer__2 b/scripts/ynh_composer__3 similarity index 76% rename from scripts/ynh_composer__2 rename to scripts/ynh_composer__3 index 762b7f7..ca68a65 100644 --- a/scripts/ynh_composer__2 +++ b/scripts/ynh_composer__3 @@ -1,5 +1,10 @@ #!/bin/bash +readonly YNH_DEFAULT_COMPOSER_VERSION=1.10.17 +# Declare the actual composer version to use. +# A packager willing to use another version of composer can override the variable into its _common.sh. +YNH_COMPOSER_VERSION=${YNH_COMPOSER_VERSION:-$YNH_DEFAULT_COMPOSER_VERSION} + # Execute a command with Composer # # usage: ynh_composer_exec [--phpversion=phpversion] [--workdir=$final_path] --commands="commands" @@ -25,26 +30,29 @@ ynh_composer_exec () { # Install and initialize Composer in the given directory # -# usage: ynh_install_composer [--phpversion=phpversion] [--workdir=$final_path] [--install_args="--optimize-autoloader"] +# usage: ynh_install_composer [--phpversion=phpversion] [--workdir=$final_path] [--install_args="--optimize-autoloader"] [--composerversion=composerversion] # | arg: -v, --phpversion - PHP version to use with composer # | arg: -w, --workdir - The directory from where the command will be executed. Default $final_path. # | arg: -a, --install_args - Additional arguments provided to the composer install. Argument --no-dev already include +# | arg: -c, --composerversion - Composer version to install ynh_install_composer () { # Declare an array to define the options of this helper. local legacy_args=vwa - declare -Ar args_array=( [v]=phpversion= [w]=workdir= [a]=install_args=) + declare -Ar args_array=( [v]=phpversion= [w]=workdir= [a]=install_args= [c]=composerversion=) local phpversion local workdir local install_args + local composerversion # Manage arguments with getopts ynh_handle_getopts_args "$@" workdir="${workdir:-$final_path}" phpversion="${phpversion:-$YNH_PHP_VERSION}" install_args="${install_args:-}" + composerversion="${composerversion:-$YNH_COMPOSER_VERSION}" curl -sS https://getcomposer.org/installer \ | COMPOSER_HOME="$workdir/.composer" \ - php${phpversion} -- --quiet --install-dir="$workdir" \ + php${phpversion} -- --quiet --install-dir="$workdir" --version=$composerversion \ || ynh_die "Unable to install Composer." # update dependencies to create composer.lock