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

Merge pull request #29 from YunoHost-Apps/testing

Browse source 
Fix composer
This commit is contained in:
yalh76 2020-11-03 19:42:26 +01:00 • committed by GitHub
commit 6c565bad2d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 16 additions and 8 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
Free and open-source content management framework.
**Shipped version:** 7.69
**Shipped version:** 7.73
## 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
Framework de gestion de contenu libre et open-source.
**Version incluse:** 7.69
**Version incluse:** 7.73
## Captures d'écran

2
manifest.json
View file

@ -6,7 +6,7 @@
"en": "Old version of a content management framework written in PHP",
"fr": "Ancienne version d'un système de gestion de contenu écrit en PHP"
},
"version": "7.71~ynh1",
"version": "7.73~ynh1",
"url": "https://www.drupal.org",
"license": "GPL-2.0-or-later",
"maintainer": {

2
scripts/install
View file

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

2
scripts/upgrade
View file

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

14
scripts/ynh_composer__2 → scripts/ynh_composer__3
View file

@ -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