1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/pixelfed_ynh.git synced 2024-09-03 20:06:04 +02:00

Merge pull request #104 from YunoHost-Apps/testing

Upgrade to 0.10.9
This commit is contained in:
yalh76 2020-04-21 23:32:47 +02:00 committed by GitHub
commit 8c5e710060
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 9 additions and 13 deletions

View file

@ -9,7 +9,7 @@ If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to
## Overview ## Overview
The federated image sharing service Pixelfed, for YunoHost The federated image sharing service Pixelfed, for YunoHost
**Shipped version:** 0.10.8 **Shipped version:** 0.10.9
## Important points to read before installing ## Important points to read before installing

View file

@ -1,5 +1,5 @@
SOURCE_URL=https://github.com/pixelfed/pixelfed/archive/v0.10.8.tar.gz SOURCE_URL=https://github.com/pixelfed/pixelfed/archive/v0.10.9.tar.gz
SOURCE_SUM=80ad527c20f5df75a5dfa9e31b8045d2e926db31ebf85ec9f6ccb0c33df240ca SOURCE_SUM=d843796473858de2f0f3cda11db2f711b8303a058660d62c6696d4cb828a8a45
OURCE_SUM_PRG=sha256sum OURCE_SUM_PRG=sha256sum
SOURCE_FORMAT=tar.gz SOURCE_FORMAT=tar.gz
SOURCE_IN_SUBDIR=true SOURCE_IN_SUBDIR=true

View file

@ -6,7 +6,7 @@
"en": "ActivityPub Federated Image Sharing", "en": "ActivityPub Federated Image Sharing",
"fr": "Logiciel de partage d'image fédéré via ActivityPub" "fr": "Logiciel de partage d'image fédéré via ActivityPub"
}, },
"version": "0.10.8~ynh1", "version": "0.10.9~ynh1",
"url": "https://pixelfed.org/", "url": "https://pixelfed.org/",
"license": "AGPL-3.0-or-later", "license": "AGPL-3.0-or-later",
"maintainer": [ "maintainer": [
@ -16,6 +16,9 @@
}, },
{ {
"name": "yalh76" "name": "yalh76"
},
{
"name": "lapineige"
} }
], ],
"requirements": { "requirements": {

View file

@ -34,6 +34,7 @@ ynh_composer_exec () {
# 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:-7.0}"
COMPOSER_HOME="$workdir/.composer" \ COMPOSER_HOME="$workdir/.composer" \
php${phpversion} "$workdir/composer.phar" $commands \ php${phpversion} "$workdir/composer.phar" $commands \
@ -53,6 +54,7 @@ ynh_install_composer () {
# 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:-7.0}"
curl -sS https://getcomposer.org/installer \ curl -sS https://getcomposer.org/installer \
| COMPOSER_HOME="$workdir/.composer" \ | COMPOSER_HOME="$workdir/.composer" \
@ -64,7 +66,6 @@ ynh_install_composer () {
|| ynh_die --message="Unable to update core dependencies with Composer." || ynh_die --message="Unable to update core dependencies with Composer."
} }
# Install another version of php. # Install another version of php.
# #
# usage: ynh_install_php --phpversion=phpversion [--package=packages] # usage: ynh_install_php --phpversion=phpversion [--package=packages]

View file

@ -86,14 +86,6 @@ ynh_print_info --message="Removing php-fpm configuration..."
# Remove the dedicated php-fpm config # Remove the dedicated php-fpm config
ynh_remove_fpm_config ynh_remove_fpm_config
#=================================================
# RESTART PHP-FPM 7.0 FPM
#=================================================
ynh_print_info --message="Start php7.0-fpm..."
#Sometimes with package_check php7.0-fpm fail to reload and stop. So starting the service, just in case.
ynh_systemd_action --service_name=php7.0-fpm --action="start"
#================================================= #=================================================
# GENERIC FINALIZATION # GENERIC FINALIZATION
#================================================= #=================================================