From 41b97f94429f7e8cf37be032c4a6f0eea41aafec Mon Sep 17 00:00:00 2001 From: yalh76 Date: Thu, 13 May 2021 21:48:53 +0200 Subject: [PATCH] Remove ynh_composer --- README.md | 2 +- README_fr.md | 2 +- check_process | 4 +++ manifest.json | 4 +-- scripts/install | 1 - scripts/upgrade | 1 - scripts/ynh_composer__3 | 61 ----------------------------------------- 7 files changed, 8 insertions(+), 67 deletions(-) delete mode 100644 scripts/ynh_composer__3 diff --git a/README.md b/README.md index 345b01e..26faf3e 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 Free and open-source content management framework. -**Shipped version:** 8.9.7 +**Shipped version:** 8.9.15 ## Screenshots diff --git a/README_fr.md b/README_fr.md index 56b4d6f..b7e1aed 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 Framework de gestion de contenu libre et open-source. -**Version incluse:** 8.9.7 +**Version incluse:** 8.9.15 ## Captures d'écran diff --git a/check_process b/check_process index 9b4c909..5a10d82 100644 --- a/check_process +++ b/check_process @@ -19,6 +19,8 @@ #upgrade=1 from_commit=f0af5b7a8e58615fe8ad73e3c1d6fe8d1369f061 # 8.9.7~ynh1 upgrade=1 from_commit=08ca36cc16691ed64a11034c810f5adefb21186a + # 8.9.7~ynh2 + upgrade=1 from_commit=69b57e0d7cd862e4e5aef0bfc2bc2634874602c4 backup_restore=1 multi_instance=1 port_already_use=0 @@ -31,3 +33,5 @@ Notification=all name=8.7.1~ynh1 ; commit=08ca36cc16691ed64a11034c810f5adefb21186a name=8.9.7~ynh1 + ; commit=69b57e0d7cd862e4e5aef0bfc2bc2634874602c4 + name=8.9.7~ynh2 diff --git a/manifest.json b/manifest.json index 9d7e25f..6c8450c 100644 --- a/manifest.json +++ b/manifest.json @@ -6,14 +6,14 @@ "en": "A content management framework written in PHP", "fr": "Un système de gestion de contenu écrit en PHP" }, - "version": "8.9.7~ynh2", + "version": "8.9.15~ynh1", "url": "https://www.drupal.org", "license": "GPL-2.0-or-later", "maintainer": { "name": "yalh76" }, "requirements": { - "yunohost": ">= 4.1.7.3" + "yunohost": ">= 4.2.0" }, "multi_instance": true, "services": [ diff --git a/scripts/install b/scripts/install index d3bc6e9..667a52a 100644 --- a/scripts/install +++ b/scripts/install @@ -7,7 +7,6 @@ #================================================= source _common.sh -source ynh_composer__3 source ynh_add_swap source /usr/share/yunohost/helpers diff --git a/scripts/upgrade b/scripts/upgrade index cb2a712..69841dd 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -7,7 +7,6 @@ #================================================= source _common.sh -source ynh_composer__3 source ynh_add_swap source /usr/share/yunohost/helpers diff --git a/scripts/ynh_composer__3 b/scripts/ynh_composer__3 deleted file mode 100644 index ca68a65..0000000 --- a/scripts/ynh_composer__3 +++ /dev/null @@ -1,61 +0,0 @@ -#!/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" -# | 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: -c, --commands - Commands to execute. -ynh_composer_exec () { - # Declare an array to define the options of this helper. - local legacy_args=vwc - declare -Ar args_array=( [v]=phpversion= [w]=workdir= [c]=commands= ) - local phpversion - local workdir - local commands - # Manage arguments with getopts - ynh_handle_getopts_args "$@" - workdir="${workdir:-$final_path}" - phpversion="${phpversion:-$YNH_PHP_VERSION}" - - COMPOSER_HOME="$workdir/.composer" \ - php${phpversion} "$workdir/composer.phar" $commands \ - -d "$workdir" --quiet --no-interaction -} - -# Install and initialize Composer in the given directory -# -# 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= [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" --version=$composerversion \ - || ynh_die "Unable to install Composer." - - # update dependencies to create composer.lock - ynh_composer_exec --phpversion="${phpversion}" --workdir="$workdir" --commands="install --no-dev $install_args" \ - || ynh_die "Unable to update core dependencies with Composer." -}