mirror of
https://github.com/YunoHost-Apps/pixelfed_ynh.git
synced 2024-09-03 20:06:04 +02:00
move functions in _common.sh
This commit is contained in:
parent
1097e63931
commit
3db6e4856a
6 changed files with 356 additions and 360 deletions
|
@ -19,6 +19,361 @@ pngquant jpegoptim gifsicle"
|
||||||
# EXPERIMENTAL HELPERS
|
# EXPERIMENTAL HELPERS
|
||||||
#=================================================
|
#=================================================
|
||||||
|
|
||||||
|
# Execute a command with Composer
|
||||||
|
#
|
||||||
|
# usage: ynh_composer_exec [--workdir=$final_path] --commands="commands"
|
||||||
|
# | 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=wc
|
||||||
|
declare -Ar args_array=( [w]=workdir= [c]=commands= )
|
||||||
|
local workdir
|
||||||
|
local commands
|
||||||
|
# Manage arguments with getopts
|
||||||
|
ynh_handle_getopts_args "$@"
|
||||||
|
workdir="${workdir:-$final_path}"
|
||||||
|
|
||||||
|
COMPOSER_HOME="$workdir/.composer" \
|
||||||
|
php "$workdir/composer.phar" $commands \
|
||||||
|
-d "$workdir" --quiet --no-interaction
|
||||||
|
}
|
||||||
|
|
||||||
|
# Install and initialize Composer in the given directory
|
||||||
|
#
|
||||||
|
# usage: ynh_install_composer [--workdir=$final_path]
|
||||||
|
# | arg: -w, --workdir - The directory from where the command will be executed. Default $final_path.
|
||||||
|
ynh_install_composer () {
|
||||||
|
# Declare an array to define the options of this helper.
|
||||||
|
local legacy_args=w
|
||||||
|
declare -Ar args_array=( [w]=workdir= )
|
||||||
|
local workdir
|
||||||
|
# Manage arguments with getopts
|
||||||
|
ynh_handle_getopts_args "$@"
|
||||||
|
workdir="${workdir:-$final_path}"
|
||||||
|
|
||||||
|
curl -sS https://getcomposer.org/installer \
|
||||||
|
| COMPOSER_HOME="$workdir/.composer" \
|
||||||
|
php -- --quiet --install-dir="$workdir" \
|
||||||
|
|| ynh_die "Unable to install Composer."
|
||||||
|
|
||||||
|
# update dependencies to create composer.lock
|
||||||
|
ynh_composer_exec --workdir="$workdir" --commands="install --no-dev" \
|
||||||
|
|| ynh_die "Unable to update core dependencies with Composer."
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
# Install another version of php.
|
||||||
|
#
|
||||||
|
# usage: ynh_install_php --phpversion=phpversion
|
||||||
|
# | arg: -v, --phpversion - Version of php to install. Can be one of 7.1, 7.2 or 7.3
|
||||||
|
ynh_install_php () {
|
||||||
|
# Declare an array to define the options of this helper.
|
||||||
|
local legacy_args=v
|
||||||
|
declare -Ar args_array=( [v]=phpversion= )
|
||||||
|
local phpversion
|
||||||
|
# Manage arguments with getopts
|
||||||
|
ynh_handle_getopts_args "$@"
|
||||||
|
|
||||||
|
# Store php_version into the config of this app
|
||||||
|
ynh_app_setting_set $app php_version $phpversion
|
||||||
|
|
||||||
|
# Install an extra repo to get multiple php versions
|
||||||
|
ynh_install_extra_repo --repo="https://packages.sury.org/php/ $(lsb_release -sc) main" --key="https://packages.sury.org/php/apt.gpg" --name=php
|
||||||
|
|
||||||
|
if [ "$phpversion" == "7.0" ]; then
|
||||||
|
ynh_die "Do not use ynh_install_php to install php7.0"
|
||||||
|
|
||||||
|
# Php 7.1
|
||||||
|
elif [ "$phpversion" == "7.1" ]; then
|
||||||
|
# Get the current version available for libpcre3 on packages.sury.org
|
||||||
|
local libpcre3_version=$(apt-cache madison "libpcre3" | grep "packages.sury.org" | tail -n1 | awk '{print $3}')
|
||||||
|
|
||||||
|
# equivs doesn't handle correctly this dependence.
|
||||||
|
# Force the upgrade of libpcre3 for php7.1
|
||||||
|
ynh_package_install "libpcre3=$libpcre3_version"
|
||||||
|
|
||||||
|
local php_dependencies="php7.1, php7.1-fpm"
|
||||||
|
|
||||||
|
# Php 7.2
|
||||||
|
elif [ "$phpversion" == "7.2" ]; then
|
||||||
|
# Get the current version available for libpcre3 on packages.sury.org
|
||||||
|
local libpcre3_version=$(apt-cache madison "libpcre3" | grep "packages.sury.org" | tail -n1 | awk '{print $3}')
|
||||||
|
|
||||||
|
# equivs doesn't handle correctly this dependence.
|
||||||
|
# Force the upgrade of libpcre3 for php7.2
|
||||||
|
ynh_package_install "libpcre3=$libpcre3_version"
|
||||||
|
|
||||||
|
local php_dependencies="php7.2, php7.2-fpm"
|
||||||
|
|
||||||
|
# Php 7.3
|
||||||
|
elif [ "$phpversion" == "7.3" ]; then
|
||||||
|
# Get the current version available for libpcre2-8-0 on packages.sury.org
|
||||||
|
local libpcre2_version=$(apt-cache madison "libpcre2-8-0" | grep "packages.sury.org" | tail -n1 | awk '{print $3}')
|
||||||
|
|
||||||
|
# equivs doesn't handle correctly this dependence.
|
||||||
|
# Force the upgrade of libpcre2-8-0 for php7.3
|
||||||
|
ynh_package_install "libpcre2-8-0=$libpcre2_version"
|
||||||
|
|
||||||
|
local php_dependencies="php7.3, php7.3-fpm"
|
||||||
|
|
||||||
|
else
|
||||||
|
ynh_die "The version $phpversion of php isn't handle by this helper."
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Store the ID of this app and the version of php requested for it
|
||||||
|
echo "$YNH_APP_ID:$phpversion" | tee --append "/etc/php/ynh_app_version"
|
||||||
|
|
||||||
|
# Build a control file for equivs-build
|
||||||
|
echo "Section: misc
|
||||||
|
Priority: optional
|
||||||
|
Package: php${phpversion}-ynh-deps
|
||||||
|
Version: 1.0
|
||||||
|
Depends: $php_dependencies
|
||||||
|
Architecture: all
|
||||||
|
Description: Fake package for php_$phpversion dependencies
|
||||||
|
This meta-package is only responsible of installing its dependencies." \
|
||||||
|
> /tmp/php_${phpversion}-ynh-deps.control
|
||||||
|
|
||||||
|
# Install the fake package for php
|
||||||
|
ynh_package_install_from_equivs /tmp/php_${phpversion}-ynh-deps.control \
|
||||||
|
|| ynh_die --message="Unable to install dependencies"
|
||||||
|
ynh_secure_remove /tmp/php_${phpversion}-ynh-deps.control
|
||||||
|
|
||||||
|
# Advertise service in admin panel
|
||||||
|
yunohost service add php${phpversion}-fpm --log "/var/log/php${phpversion}-fpm.log"
|
||||||
|
}
|
||||||
|
|
||||||
|
ynh_remove_php () {
|
||||||
|
# Get the version of php used by this app
|
||||||
|
local phpversion=$(ynh_app_setting_get $app php_version)
|
||||||
|
|
||||||
|
if [ "$phpversion" == "7.0" ] || [ -z "$phpversion" ]
|
||||||
|
then
|
||||||
|
if [ "$phpversion" == "7.0" ]
|
||||||
|
then
|
||||||
|
ynh_print_err "Do not use ynh_remove_php to install php7.0"
|
||||||
|
fi
|
||||||
|
return 0
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Remove the line for this app
|
||||||
|
sed --in-place "/$YNH_APP_ID:$phpversion/d" "/etc/php/ynh_app_version"
|
||||||
|
|
||||||
|
# If no other app uses this version of php, remove it.
|
||||||
|
if ! grep --quiet "$phpversion" "/etc/php/ynh_app_version"
|
||||||
|
then
|
||||||
|
# Remove the metapackage for php
|
||||||
|
ynh_package_autopurge php${phpversion}-ynh-deps
|
||||||
|
# Then remove php-fpm php-cli for this version.
|
||||||
|
# The previous command won't remove them, but we have to remove those package to clean php
|
||||||
|
ynh_package_autopurge php${phpversion}-fpm php${phpversion}-cli
|
||||||
|
|
||||||
|
if [ "$phpversion" == "7.1" ] || [ "$phpversion" == "7.2" ]
|
||||||
|
then
|
||||||
|
# Do not restore libpcre3 if php7.1 or 7.2 is still used.
|
||||||
|
if ! grep --quiet --extended-regexp "7.1|7.2" "/etc/php/ynh_app_version"
|
||||||
|
then
|
||||||
|
# Get the current version available for libpcre3 on the standard repo
|
||||||
|
local libpcre3_version=$(apt-cache madison "libpcre3" | grep "debian.org" | tail -n1 | awk '{print $3}')
|
||||||
|
|
||||||
|
# Force to reinstall the standard version of libpcre3
|
||||||
|
ynh_package_install --allow-downgrades libpcre3=$libpcre3_version >&2
|
||||||
|
fi
|
||||||
|
elif [ "$phpversion" == "7.3" ]
|
||||||
|
then
|
||||||
|
# Get the current version available for libpcre2-8-0 on the standard repo
|
||||||
|
local libpcre2_version=$(apt-cache madison "libpcre2-8-0" | grep "debian.org" | tail -n1 | awk '{print $3}')
|
||||||
|
|
||||||
|
# Force to reinstall the standard version of libpcre2-8-0
|
||||||
|
ynh_package_install --allow-downgrades libpcre2-8-0=$libpcre2_version
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Remove the service from the admin panel
|
||||||
|
yunohost service remove php${phpversion}-fpm
|
||||||
|
fi
|
||||||
|
|
||||||
|
# If no other app uses alternate php versions, remove the extra repo for php
|
||||||
|
if [ ! -s "/etc/php/ynh_app_version" ]
|
||||||
|
then
|
||||||
|
ynh_remove_extra_repo --name=php
|
||||||
|
ynh_secure_remove /etc/php/ynh_app_version
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#=================================================
|
#=================================================
|
||||||
# FUTURE OFFICIAL HELPERS
|
# FUTURE OFFICIAL HELPERS
|
||||||
#=================================================
|
#=================================================
|
||||||
|
# Pin a repository.
|
||||||
|
#
|
||||||
|
# usage: ynh_pin_repo --package=packages --pin=pin_filter --priority=priority_value [--name=name] [--append]
|
||||||
|
# | arg: -p, --package - Packages concerned by the pin. Or all, *.
|
||||||
|
# | arg: -i, --pin - Filter for the pin.
|
||||||
|
# | arg: -p, --priority - Priority for the pin
|
||||||
|
# | arg: -n, --name - Name for the files for this repo, $app as default value.
|
||||||
|
# | arg: -a, --append - Do not overwrite existing files.
|
||||||
|
#
|
||||||
|
# See https://manpages.debian.org/stretch/apt/apt_preferences.5.en.html for information about pinning.
|
||||||
|
#
|
||||||
|
ynh_pin_repo () {
|
||||||
|
# Declare an array to define the options of this helper.
|
||||||
|
local legacy_args=pirna
|
||||||
|
declare -Ar args_array=( [p]=package= [i]=pin= [r]=priority= [n]=name= [a]=append )
|
||||||
|
local package
|
||||||
|
local pin
|
||||||
|
local priority
|
||||||
|
local name
|
||||||
|
local append
|
||||||
|
# Manage arguments with getopts
|
||||||
|
ynh_handle_getopts_args "$@"
|
||||||
|
package="${package:-*}"
|
||||||
|
priority=${priority:-50}
|
||||||
|
name="${name:-$app}"
|
||||||
|
append=${append:-0}
|
||||||
|
|
||||||
|
if [ $append -eq 1 ]
|
||||||
|
then
|
||||||
|
append="tee -a"
|
||||||
|
else
|
||||||
|
append="tee"
|
||||||
|
fi
|
||||||
|
|
||||||
|
mkdir -p "/etc/apt/preferences.d"
|
||||||
|
echo "Package: $package
|
||||||
|
Pin: $pin
|
||||||
|
Pin-Priority: $priority" \
|
||||||
|
| $append "/etc/apt/preferences.d/$name"
|
||||||
|
}
|
||||||
|
|
||||||
|
# Add a repository.
|
||||||
|
#
|
||||||
|
# usage: ynh_add_repo --uri=uri --suite=suite --component=component [--name=name] [--append]
|
||||||
|
# | arg: -u, --uri - Uri of the repository.
|
||||||
|
# | arg: -s, --suite - Suite of the repository.
|
||||||
|
# | arg: -c, --component - Component of the repository.
|
||||||
|
# | arg: -n, --name - Name for the files for this repo, $app as default value.
|
||||||
|
# | arg: -a, --append - Do not overwrite existing files.
|
||||||
|
#
|
||||||
|
# Example for a repo like deb http://forge.yunohost.org/debian/ stretch stable
|
||||||
|
# uri suite component
|
||||||
|
# ynh_add_repo --uri=http://forge.yunohost.org/debian/ --suite=stretch --component=stable
|
||||||
|
#
|
||||||
|
ynh_add_repo () {
|
||||||
|
# Declare an array to define the options of this helper.
|
||||||
|
local legacy_args=uscna
|
||||||
|
declare -Ar args_array=( [u]=uri= [s]=suite= [c]=component= [n]=name= [a]=append )
|
||||||
|
local uri
|
||||||
|
local suite
|
||||||
|
local component
|
||||||
|
local name
|
||||||
|
local append
|
||||||
|
# Manage arguments with getopts
|
||||||
|
ynh_handle_getopts_args "$@"
|
||||||
|
name="${name:-$app}"
|
||||||
|
append=${append:-0}
|
||||||
|
|
||||||
|
if [ $append -eq 1 ]
|
||||||
|
then
|
||||||
|
append="tee -a"
|
||||||
|
else
|
||||||
|
append="tee"
|
||||||
|
fi
|
||||||
|
|
||||||
|
mkdir -p "/etc/apt/sources.list.d"
|
||||||
|
# Add the new repo in sources.list.d
|
||||||
|
echo "deb $uri $suite $component" \
|
||||||
|
| $append "/etc/apt/sources.list.d/$name.list"
|
||||||
|
}
|
||||||
|
|
||||||
|
# Add an extra repository correctly, pin it and get the key.
|
||||||
|
#
|
||||||
|
# usage: ynh_install_extra_repo --repo="repo" [--key=key_url] [--name=name] [--append]
|
||||||
|
# | arg: -r, --repo - Complete url of the extra repository.
|
||||||
|
# | arg: -k, --key - url to get the public key.
|
||||||
|
# | arg: -n, --name - Name for the files for this repo, $app as default value.
|
||||||
|
# | arg: -a, --append - Do not overwrite existing files.
|
||||||
|
ynh_install_extra_repo () {
|
||||||
|
# Declare an array to define the options of this helper.
|
||||||
|
local legacy_args=rkna
|
||||||
|
declare -Ar args_array=( [r]=repo= [k]=key= [n]=name= [a]=append )
|
||||||
|
local repo
|
||||||
|
local key
|
||||||
|
local name
|
||||||
|
local append
|
||||||
|
# Manage arguments with getopts
|
||||||
|
ynh_handle_getopts_args "$@"
|
||||||
|
name="${name:-$app}"
|
||||||
|
append=${append:-0}
|
||||||
|
key=${key:-0}
|
||||||
|
|
||||||
|
if [ $append -eq 1 ]
|
||||||
|
then
|
||||||
|
append="--append"
|
||||||
|
wget_append="tee -a"
|
||||||
|
else
|
||||||
|
append=""
|
||||||
|
wget_append="tee"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Split the repository into uri, suite and components.
|
||||||
|
# Remove "deb " at the beginning of the repo.
|
||||||
|
repo="${repo#deb }"
|
||||||
|
|
||||||
|
# Get the uri
|
||||||
|
local uri="$(echo "$repo" | awk '{ print $1 }')"
|
||||||
|
|
||||||
|
# Get the suite
|
||||||
|
local suite="$(echo "$repo" | awk '{ print $2 }')"
|
||||||
|
|
||||||
|
# Get the components
|
||||||
|
local component="${repo##$uri $suite }"
|
||||||
|
|
||||||
|
# Add the repository into sources.list.d
|
||||||
|
ynh_add_repo --uri="$uri" --suite="$suite" --component="$component" --name="$name" $append
|
||||||
|
|
||||||
|
# Pin the new repo with the default priority, so it won't be used for upgrades.
|
||||||
|
# Build $pin from the uri without http and any sub path
|
||||||
|
local pin="${uri#*://}"
|
||||||
|
pin="${pin%%/*}"
|
||||||
|
ynh_pin_repo --package="*" --pin="origin \"$pin\"" --name="$name" $append
|
||||||
|
|
||||||
|
# Get the public key for the repo
|
||||||
|
if [ -n "$key" ]
|
||||||
|
then
|
||||||
|
mkdir -p "/etc/apt/trusted.gpg.d"
|
||||||
|
if [[ "$(basename "$key")" =~ ".asc" ]]
|
||||||
|
then
|
||||||
|
local key_ext=asc
|
||||||
|
else
|
||||||
|
local key_ext=gpg
|
||||||
|
fi
|
||||||
|
wget -q "$key" -O - | $wget_append /etc/apt/trusted.gpg.d/$name.$key_ext
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Update the list of package with the new repo
|
||||||
|
ynh_package_update
|
||||||
|
}
|
||||||
|
|
||||||
|
# Remove an extra repository and the assiociated configuration.
|
||||||
|
#
|
||||||
|
# usage: ynh_remove_extra_repo [--name=name]
|
||||||
|
# | arg: -n, --name - Name for the files for this repo, $app as default value.
|
||||||
|
ynh_remove_extra_repo () {
|
||||||
|
# Declare an array to define the options of this helper.
|
||||||
|
local legacy_args=n
|
||||||
|
declare -Ar args_array=( [n]=name= )
|
||||||
|
local name
|
||||||
|
# Manage arguments with getopts
|
||||||
|
ynh_handle_getopts_args "$@"
|
||||||
|
name="${name:-$app}"
|
||||||
|
|
||||||
|
ynh_secure_remove "/etc/apt/sources.list.d/$name.list"
|
||||||
|
ynh_secure_remove "/etc/apt/preferences.d/$name"
|
||||||
|
ynh_secure_remove "/etc/apt/trusted.gpg.d/$name.gpg"
|
||||||
|
ynh_secure_remove "/etc/apt/trusted.gpg.d/$name.asc"
|
||||||
|
|
||||||
|
# Update the list of package to exclude the old repo
|
||||||
|
ynh_package_update
|
||||||
|
}
|
||||||
|
|
|
@ -7,9 +7,6 @@
|
||||||
#=================================================
|
#=================================================
|
||||||
|
|
||||||
source _common.sh
|
source _common.sh
|
||||||
source ynh_install_php
|
|
||||||
source ynh_add_secure_repos__2
|
|
||||||
source ynh_composer
|
|
||||||
source /usr/share/yunohost/helpers
|
source /usr/share/yunohost/helpers
|
||||||
|
|
||||||
#=================================================
|
#=================================================
|
||||||
|
|
|
@ -7,8 +7,6 @@
|
||||||
#=================================================
|
#=================================================
|
||||||
|
|
||||||
source _common.sh
|
source _common.sh
|
||||||
source ynh_install_php
|
|
||||||
source ynh_add_secure_repos__2
|
|
||||||
source /usr/share/yunohost/helpers
|
source /usr/share/yunohost/helpers
|
||||||
|
|
||||||
#=================================================
|
#=================================================
|
||||||
|
|
|
@ -1,173 +0,0 @@
|
||||||
#!/bin/bash
|
|
||||||
|
|
||||||
# Pin a repository.
|
|
||||||
#
|
|
||||||
# usage: ynh_pin_repo --package=packages --pin=pin_filter --priority=priority_value [--name=name] [--append]
|
|
||||||
# | arg: -p, --package - Packages concerned by the pin. Or all, *.
|
|
||||||
# | arg: -i, --pin - Filter for the pin.
|
|
||||||
# | arg: -p, --priority - Priority for the pin
|
|
||||||
# | arg: -n, --name - Name for the files for this repo, $app as default value.
|
|
||||||
# | arg: -a, --append - Do not overwrite existing files.
|
|
||||||
#
|
|
||||||
# See https://manpages.debian.org/stretch/apt/apt_preferences.5.en.html for information about pinning.
|
|
||||||
#
|
|
||||||
ynh_pin_repo () {
|
|
||||||
# Declare an array to define the options of this helper.
|
|
||||||
local legacy_args=pirna
|
|
||||||
declare -Ar args_array=( [p]=package= [i]=pin= [r]=priority= [n]=name= [a]=append )
|
|
||||||
local package
|
|
||||||
local pin
|
|
||||||
local priority
|
|
||||||
local name
|
|
||||||
local append
|
|
||||||
# Manage arguments with getopts
|
|
||||||
ynh_handle_getopts_args "$@"
|
|
||||||
package="${package:-*}"
|
|
||||||
priority=${priority:-50}
|
|
||||||
name="${name:-$app}"
|
|
||||||
append=${append:-0}
|
|
||||||
|
|
||||||
if [ $append -eq 1 ]
|
|
||||||
then
|
|
||||||
append="tee -a"
|
|
||||||
else
|
|
||||||
append="tee"
|
|
||||||
fi
|
|
||||||
|
|
||||||
mkdir -p "/etc/apt/preferences.d"
|
|
||||||
echo "Package: $package
|
|
||||||
Pin: $pin
|
|
||||||
Pin-Priority: $priority" \
|
|
||||||
| $append "/etc/apt/preferences.d/$name"
|
|
||||||
}
|
|
||||||
|
|
||||||
# Add a repository.
|
|
||||||
#
|
|
||||||
# usage: ynh_add_repo --uri=uri --suite=suite --component=component [--name=name] [--append]
|
|
||||||
# | arg: -u, --uri - Uri of the repository.
|
|
||||||
# | arg: -s, --suite - Suite of the repository.
|
|
||||||
# | arg: -c, --component - Component of the repository.
|
|
||||||
# | arg: -n, --name - Name for the files for this repo, $app as default value.
|
|
||||||
# | arg: -a, --append - Do not overwrite existing files.
|
|
||||||
#
|
|
||||||
# Example for a repo like deb http://forge.yunohost.org/debian/ stretch stable
|
|
||||||
# uri suite component
|
|
||||||
# ynh_add_repo --uri=http://forge.yunohost.org/debian/ --suite=stretch --component=stable
|
|
||||||
#
|
|
||||||
ynh_add_repo () {
|
|
||||||
# Declare an array to define the options of this helper.
|
|
||||||
local legacy_args=uscna
|
|
||||||
declare -Ar args_array=( [u]=uri= [s]=suite= [c]=component= [n]=name= [a]=append )
|
|
||||||
local uri
|
|
||||||
local suite
|
|
||||||
local component
|
|
||||||
local name
|
|
||||||
local append
|
|
||||||
# Manage arguments with getopts
|
|
||||||
ynh_handle_getopts_args "$@"
|
|
||||||
name="${name:-$app}"
|
|
||||||
append=${append:-0}
|
|
||||||
|
|
||||||
if [ $append -eq 1 ]
|
|
||||||
then
|
|
||||||
append="tee -a"
|
|
||||||
else
|
|
||||||
append="tee"
|
|
||||||
fi
|
|
||||||
|
|
||||||
mkdir -p "/etc/apt/sources.list.d"
|
|
||||||
# Add the new repo in sources.list.d
|
|
||||||
echo "deb $uri $suite $component" \
|
|
||||||
| $append "/etc/apt/sources.list.d/$name.list"
|
|
||||||
}
|
|
||||||
|
|
||||||
# Add an extra repository correctly, pin it and get the key.
|
|
||||||
#
|
|
||||||
# usage: ynh_install_extra_repo --repo="repo" [--key=key_url] [--name=name] [--append]
|
|
||||||
# | arg: -r, --repo - Complete url of the extra repository.
|
|
||||||
# | arg: -k, --key - url to get the public key.
|
|
||||||
# | arg: -n, --name - Name for the files for this repo, $app as default value.
|
|
||||||
# | arg: -a, --append - Do not overwrite existing files.
|
|
||||||
ynh_install_extra_repo () {
|
|
||||||
# Declare an array to define the options of this helper.
|
|
||||||
local legacy_args=rkna
|
|
||||||
declare -Ar args_array=( [r]=repo= [k]=key= [n]=name= [a]=append )
|
|
||||||
local repo
|
|
||||||
local key
|
|
||||||
local name
|
|
||||||
local append
|
|
||||||
# Manage arguments with getopts
|
|
||||||
ynh_handle_getopts_args "$@"
|
|
||||||
name="${name:-$app}"
|
|
||||||
append=${append:-0}
|
|
||||||
key=${key:-0}
|
|
||||||
|
|
||||||
if [ $append -eq 1 ]
|
|
||||||
then
|
|
||||||
append="--append"
|
|
||||||
wget_append="tee -a"
|
|
||||||
else
|
|
||||||
append=""
|
|
||||||
wget_append="tee"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Split the repository into uri, suite and components.
|
|
||||||
# Remove "deb " at the beginning of the repo.
|
|
||||||
repo="${repo#deb }"
|
|
||||||
|
|
||||||
# Get the uri
|
|
||||||
local uri="$(echo "$repo" | awk '{ print $1 }')"
|
|
||||||
|
|
||||||
# Get the suite
|
|
||||||
local suite="$(echo "$repo" | awk '{ print $2 }')"
|
|
||||||
|
|
||||||
# Get the components
|
|
||||||
local component="${repo##$uri $suite }"
|
|
||||||
|
|
||||||
# Add the repository into sources.list.d
|
|
||||||
ynh_add_repo --uri="$uri" --suite="$suite" --component="$component" --name="$name" $append
|
|
||||||
|
|
||||||
# Pin the new repo with the default priority, so it won't be used for upgrades.
|
|
||||||
# Build $pin from the uri without http and any sub path
|
|
||||||
local pin="${uri#*://}"
|
|
||||||
pin="${pin%%/*}"
|
|
||||||
ynh_pin_repo --package="*" --pin="origin \"$pin\"" --name="$name" $append
|
|
||||||
|
|
||||||
# Get the public key for the repo
|
|
||||||
if [ -n "$key" ]
|
|
||||||
then
|
|
||||||
mkdir -p "/etc/apt/trusted.gpg.d"
|
|
||||||
if [[ "$(basename "$key")" =~ ".asc" ]]
|
|
||||||
then
|
|
||||||
local key_ext=asc
|
|
||||||
else
|
|
||||||
local key_ext=gpg
|
|
||||||
fi
|
|
||||||
wget -q "$key" -O - | $wget_append /etc/apt/trusted.gpg.d/$name.$key_ext
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Update the list of package with the new repo
|
|
||||||
ynh_package_update
|
|
||||||
}
|
|
||||||
|
|
||||||
# Remove an extra repository and the assiociated configuration.
|
|
||||||
#
|
|
||||||
# usage: ynh_remove_extra_repo [--name=name]
|
|
||||||
# | arg: -n, --name - Name for the files for this repo, $app as default value.
|
|
||||||
ynh_remove_extra_repo () {
|
|
||||||
# Declare an array to define the options of this helper.
|
|
||||||
local legacy_args=n
|
|
||||||
declare -Ar args_array=( [n]=name= )
|
|
||||||
local name
|
|
||||||
# Manage arguments with getopts
|
|
||||||
ynh_handle_getopts_args "$@"
|
|
||||||
name="${name:-$app}"
|
|
||||||
|
|
||||||
ynh_secure_remove "/etc/apt/sources.list.d/$name.list"
|
|
||||||
ynh_secure_remove "/etc/apt/preferences.d/$name"
|
|
||||||
ynh_secure_remove "/etc/apt/trusted.gpg.d/$name.gpg"
|
|
||||||
ynh_secure_remove "/etc/apt/trusted.gpg.d/$name.asc"
|
|
||||||
|
|
||||||
# Update the list of package to exclude the old repo
|
|
||||||
ynh_package_update
|
|
||||||
}
|
|
|
@ -1,44 +0,0 @@
|
||||||
#!/bin/bash
|
|
||||||
|
|
||||||
# Execute a command with Composer
|
|
||||||
#
|
|
||||||
# usage: ynh_composer_exec [--workdir=$final_path] --commands="commands"
|
|
||||||
# | 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=wc
|
|
||||||
declare -Ar args_array=( [w]=workdir= [c]=commands= )
|
|
||||||
local workdir
|
|
||||||
local commands
|
|
||||||
# Manage arguments with getopts
|
|
||||||
ynh_handle_getopts_args "$@"
|
|
||||||
workdir="${workdir:-$final_path}"
|
|
||||||
|
|
||||||
COMPOSER_HOME="$workdir/.composer" \
|
|
||||||
php "$workdir/composer.phar" $commands \
|
|
||||||
-d "$workdir" --quiet --no-interaction
|
|
||||||
}
|
|
||||||
|
|
||||||
# Install and initialize Composer in the given directory
|
|
||||||
#
|
|
||||||
# usage: ynh_install_composer [--workdir=$final_path]
|
|
||||||
# | arg: -w, --workdir - The directory from where the command will be executed. Default $final_path.
|
|
||||||
ynh_install_composer () {
|
|
||||||
# Declare an array to define the options of this helper.
|
|
||||||
local legacy_args=w
|
|
||||||
declare -Ar args_array=( [w]=workdir= )
|
|
||||||
local workdir
|
|
||||||
# Manage arguments with getopts
|
|
||||||
ynh_handle_getopts_args "$@"
|
|
||||||
workdir="${workdir:-$final_path}"
|
|
||||||
|
|
||||||
curl -sS https://getcomposer.org/installer \
|
|
||||||
| COMPOSER_HOME="$workdir/.composer" \
|
|
||||||
php -- --quiet --install-dir="$workdir" \
|
|
||||||
|| ynh_die "Unable to install Composer."
|
|
||||||
|
|
||||||
# update dependencies to create composer.lock
|
|
||||||
ynh_composer_exec --workdir="$workdir" --commands="install --no-dev" \
|
|
||||||
|| ynh_die "Unable to update core dependencies with Composer."
|
|
||||||
}
|
|
|
@ -1,139 +1,2 @@
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
# Install another version of php.
|
|
||||||
#
|
|
||||||
# usage: ynh_install_php --phpversion=phpversion
|
|
||||||
# | arg: -v, --phpversion - Version of php to install. Can be one of 7.1, 7.2 or 7.3
|
|
||||||
ynh_install_php () {
|
|
||||||
# Declare an array to define the options of this helper.
|
|
||||||
local legacy_args=v
|
|
||||||
declare -Ar args_array=( [v]=phpversion= )
|
|
||||||
local phpversion
|
|
||||||
# Manage arguments with getopts
|
|
||||||
ynh_handle_getopts_args "$@"
|
|
||||||
|
|
||||||
# Store php_version into the config of this app
|
|
||||||
ynh_app_setting_set $app php_version $phpversion
|
|
||||||
|
|
||||||
# Install an extra repo to get multiple php versions
|
|
||||||
ynh_install_extra_repo --repo="https://packages.sury.org/php/ $(lsb_release -sc) main" --key="https://packages.sury.org/php/apt.gpg" --name=php
|
|
||||||
|
|
||||||
if [ "$phpversion" == "7.0" ]; then
|
|
||||||
ynh_die "Do not use ynh_install_php to install php7.0"
|
|
||||||
|
|
||||||
# Php 7.1
|
|
||||||
elif [ "$phpversion" == "7.1" ]; then
|
|
||||||
# Get the current version available for libpcre3 on packages.sury.org
|
|
||||||
local libpcre3_version=$(apt-cache madison "libpcre3" | grep "packages.sury.org" | tail -n1 | awk '{print $3}')
|
|
||||||
|
|
||||||
# equivs doesn't handle correctly this dependence.
|
|
||||||
# Force the upgrade of libpcre3 for php7.1
|
|
||||||
ynh_package_install "libpcre3=$libpcre3_version"
|
|
||||||
|
|
||||||
local php_dependencies="php7.1, php7.1-fpm"
|
|
||||||
|
|
||||||
# Php 7.2
|
|
||||||
elif [ "$phpversion" == "7.2" ]; then
|
|
||||||
# Get the current version available for libpcre3 on packages.sury.org
|
|
||||||
local libpcre3_version=$(apt-cache madison "libpcre3" | grep "packages.sury.org" | tail -n1 | awk '{print $3}')
|
|
||||||
|
|
||||||
# equivs doesn't handle correctly this dependence.
|
|
||||||
# Force the upgrade of libpcre3 for php7.2
|
|
||||||
ynh_package_install "libpcre3=$libpcre3_version"
|
|
||||||
|
|
||||||
local php_dependencies="php7.2, php7.2-fpm"
|
|
||||||
|
|
||||||
# Php 7.3
|
|
||||||
elif [ "$phpversion" == "7.3" ]; then
|
|
||||||
# Get the current version available for libpcre2-8-0 on packages.sury.org
|
|
||||||
local libpcre2_version=$(apt-cache madison "libpcre2-8-0" | grep "packages.sury.org" | tail -n1 | awk '{print $3}')
|
|
||||||
|
|
||||||
# equivs doesn't handle correctly this dependence.
|
|
||||||
# Force the upgrade of libpcre2-8-0 for php7.3
|
|
||||||
ynh_package_install "libpcre2-8-0=$libpcre2_version"
|
|
||||||
|
|
||||||
local php_dependencies="php7.3, php7.3-fpm"
|
|
||||||
|
|
||||||
else
|
|
||||||
ynh_die "The version $phpversion of php isn't handle by this helper."
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Store the ID of this app and the version of php requested for it
|
|
||||||
echo "$YNH_APP_ID:$phpversion" | tee --append "/etc/php/ynh_app_version"
|
|
||||||
|
|
||||||
# Build a control file for equivs-build
|
|
||||||
echo "Section: misc
|
|
||||||
Priority: optional
|
|
||||||
Package: php${phpversion}-ynh-deps
|
|
||||||
Version: 1.0
|
|
||||||
Depends: $php_dependencies
|
|
||||||
Architecture: all
|
|
||||||
Description: Fake package for php_$phpversion dependencies
|
|
||||||
This meta-package is only responsible of installing its dependencies." \
|
|
||||||
> /tmp/php_${phpversion}-ynh-deps.control
|
|
||||||
|
|
||||||
# Install the fake package for php
|
|
||||||
ynh_package_install_from_equivs /tmp/php_${phpversion}-ynh-deps.control \
|
|
||||||
|| ynh_die --message="Unable to install dependencies"
|
|
||||||
ynh_secure_remove /tmp/php_${phpversion}-ynh-deps.control
|
|
||||||
|
|
||||||
# Advertise service in admin panel
|
|
||||||
yunohost service add php${phpversion}-fpm --log "/var/log/php${phpversion}-fpm.log"
|
|
||||||
}
|
|
||||||
|
|
||||||
ynh_remove_php () {
|
|
||||||
# Get the version of php used by this app
|
|
||||||
local phpversion=$(ynh_app_setting_get $app php_version)
|
|
||||||
|
|
||||||
if [ "$phpversion" == "7.0" ] || [ -z "$phpversion" ]
|
|
||||||
then
|
|
||||||
if [ "$phpversion" == "7.0" ]
|
|
||||||
then
|
|
||||||
ynh_print_err "Do not use ynh_remove_php to install php7.0"
|
|
||||||
fi
|
|
||||||
return 0
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Remove the line for this app
|
|
||||||
sed --in-place "/$YNH_APP_ID:$phpversion/d" "/etc/php/ynh_app_version"
|
|
||||||
|
|
||||||
# If no other app uses this version of php, remove it.
|
|
||||||
if ! grep --quiet "$phpversion" "/etc/php/ynh_app_version"
|
|
||||||
then
|
|
||||||
# Remove the metapackage for php
|
|
||||||
ynh_package_autopurge php${phpversion}-ynh-deps
|
|
||||||
# Then remove php-fpm php-cli for this version.
|
|
||||||
# The previous command won't remove them, but we have to remove those package to clean php
|
|
||||||
ynh_package_autopurge php${phpversion}-fpm php${phpversion}-cli
|
|
||||||
|
|
||||||
if [ "$phpversion" == "7.1" ] || [ "$phpversion" == "7.2" ]
|
|
||||||
then
|
|
||||||
# Do not restore libpcre3 if php7.1 or 7.2 is still used.
|
|
||||||
if ! grep --quiet --extended-regexp "7.1|7.2" "/etc/php/ynh_app_version"
|
|
||||||
then
|
|
||||||
# Get the current version available for libpcre3 on the standard repo
|
|
||||||
local libpcre3_version=$(apt-cache madison "libpcre3" | grep "debian.org" | tail -n1 | awk '{print $3}')
|
|
||||||
|
|
||||||
# Force to reinstall the standard version of libpcre3
|
|
||||||
ynh_package_install --allow-downgrades libpcre3=$libpcre3_version >&2
|
|
||||||
fi
|
|
||||||
elif [ "$phpversion" == "7.3" ]
|
|
||||||
then
|
|
||||||
# Get the current version available for libpcre2-8-0 on the standard repo
|
|
||||||
local libpcre2_version=$(apt-cache madison "libpcre2-8-0" | grep "debian.org" | tail -n1 | awk '{print $3}')
|
|
||||||
|
|
||||||
# Force to reinstall the standard version of libpcre2-8-0
|
|
||||||
ynh_package_install --allow-downgrades libpcre2-8-0=$libpcre2_version
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Remove the service from the admin panel
|
|
||||||
yunohost service remove php${phpversion}-fpm
|
|
||||||
fi
|
|
||||||
|
|
||||||
# If no other app uses alternate php versions, remove the extra repo for php
|
|
||||||
if [ ! -s "/etc/php/ynh_app_version" ]
|
|
||||||
then
|
|
||||||
ynh_remove_extra_repo --name=php
|
|
||||||
ynh_secure_remove /etc/php/ynh_app_version
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue