YunoHost-Apps/civicrm_drupal7_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/civicrm_drupal7_ynh.git synced 2024-09-03 18:16:19 +02:00
Code Issues Activity Actions

Fix composer

Browse source
This commit is contained in:
yalh76 2020-11-01 20:03:20 +01:00
parent 3b0cd5e3f1
commit a0483eb54a
8 changed files with 20 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -11,7 +11,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
## Overview ## Overview
Open source constituent relationship management (CRM) for non-profits, NGOs and advocacy organizations. 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 ## Screenshots

2
README_fr.md
View file

@ -11,7 +11,7 @@ Si vous n'avez pas YunoHost, consultez [le guide](https://yunohost.org/#/install
## Vue d'ensemble ## 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. 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 ## Captures d'écran

4
conf/civicrm-drupal.src
View file

@ -1,5 +1,5 @@
SOURCE_URL=https://storage.googleapis.com/civicrm/civicrm-stable/5.26.1/civicrm-5.26.1-drupal.tar.gz SOURCE_URL=https://storage.googleapis.com/civicrm/civicrm-stable/5.30.1/civicrm-5.30.1-drupal.tar.gz
SOURCE_SUM=7b02566bfcf885d04c8428ab4da381881dd3846eedf8535e746d5855df1b7425 SOURCE_SUM=47b7c90c7e941e7b1c56c599026bb7d8c6b4582e31bb28324b5fff243eeb4be5
SOURCE_SUM_PRG=sha256sum SOURCE_SUM_PRG=sha256sum
SOURCE_FORMAT=tar.gz SOURCE_FORMAT=tar.gz
SOURCE_IN_SUBDIR=true SOURCE_IN_SUBDIR=true

4
conf/civicrm-l10n.src
View file

@ -1,5 +1,5 @@
SOURCE_URL=https://storage.googleapis.com/civicrm/civicrm-stable/5.26.1/civicrm-5.26.1-l10n.tar.gz SOURCE_URL=https://storage.googleapis.com/civicrm/civicrm-stable/5.30.1/civicrm-5.30.1-l10n.tar.gz
SOURCE_SUM=f1a5b3224989a919d8f60e7b842ebf49551cf6ef880475ae2c0cbb24f0397706 SOURCE_SUM=130758ce8e611f18a055e4882c79b8fb092c99f1de9ac7da9e40bd5b2137824e
SOURCE_SUM_PRG=sha256sum SOURCE_SUM_PRG=sha256sum
SOURCE_FORMAT=tar.gz SOURCE_FORMAT=tar.gz
SOURCE_IN_SUBDIR=true SOURCE_IN_SUBDIR=true

2
manifest.json
View file

@ -6,7 +6,7 @@
"en": "CRM for non-profits, NGOs and advocacy organizations.", "en": "CRM for non-profits, NGOs and advocacy organizations.",
"fr": "CRM pour organisations à but non lucratif et ONG." "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", "url": "https://civicrm.org",
"license": "AGPL-3.0-or-later", "license": "AGPL-3.0-or-later",
"maintainer": { "maintainer": {

2
scripts/install
View file

@ -7,7 +7,7 @@
#================================================= #=================================================
source _common.sh source _common.sh
source ynh_composer__2 source ynh_composer__3
source /usr/share/yunohost/helpers source /usr/share/yunohost/helpers
#================================================= #=================================================

2
scripts/upgrade
View file

@ -7,7 +7,7 @@
#================================================= #=================================================
source _common.sh source _common.sh
source ynh_composer__2 source ynh_composer__3
source /usr/share/yunohost/helpers source /usr/share/yunohost/helpers
#================================================= #=================================================

14
scripts/ynh_composer__2 → scripts/ynh_composer__3
View file

@ -1,5 +1,10 @@
#!/bin/bash #!/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 # Execute a command with Composer
# #
# usage: ynh_composer_exec [--phpversion=phpversion] [--workdir=$final_path] --commands="commands" # 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 # 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: -v, --phpversion - PHP version to use with composer
# | arg: -w, --workdir - The directory from where the command will be executed. Default $final_path. # | 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: -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 () { ynh_install_composer () {
# Declare an array to define the options of this helper. # Declare an array to define the options of this helper.
local legacy_args=vwa 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 phpversion
local workdir local workdir
local install_args local install_args
local composerversion
# Manage arguments with getopts # Manage arguments with getopts
ynh_handle_getopts_args "$@" ynh_handle_getopts_args "$@"
workdir="${workdir:-$final_path}" workdir="${workdir:-$final_path}"
phpversion="${phpversion:-$YNH_PHP_VERSION}" phpversion="${phpversion:-$YNH_PHP_VERSION}"
install_args="${install_args:-}" install_args="${install_args:-}"
composerversion="${composerversion:-$YNH_COMPOSER_VERSION}"
curl -sS https://getcomposer.org/installer \ curl -sS https://getcomposer.org/installer \
| COMPOSER_HOME="$workdir/.composer" \ | COMPOSER_HOME="$workdir/.composer" \
php${phpversion} -- --quiet --install-dir="$workdir" \ php${phpversion} -- --quiet --install-dir="$workdir" --version=$composerversion \
|| ynh_die "Unable to install Composer." || ynh_die "Unable to install Composer."
# update dependencies to create composer.lock # update dependencies to create composer.lock