From ad39f14ce54d80d30c2e847d0b47a7b5af6b6920 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Sun, 9 May 2021 22:46:23 +0200
Subject: [PATCH] Testing

* upgrade to version 21.04.4
---
 README.md          |  4 +--
 README_fr.md       |  4 +--
 conf/app.src       |  4 +--
 manifest.json      |  4 +--
 scripts/_common.sh | 63 ++--------------------------------------------
 scripts/install    |  5 ++--
 scripts/restore    |  5 ++--
 scripts/upgrade    |  5 ++--
 8 files changed, 19 insertions(+), 75 deletions(-)

diff --git a/README.md b/README.md
index 91b0e8d..4e9fda9 100644
--- a/README.md
+++ b/README.md
@@ -6,14 +6,14 @@
 *[Lire ce readme en français.](./README_fr.md)*
 
 > *This package allows you to install BookStack quickly and simply on a YunoHost server.  
-If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/install) to learn how to install it.*
+If you don't have YunoHost, please consult [the guide](https://yunohost.org/install) to learn how to install it.*
 
 ## Overview
 BookStack is a simple, self-hosted, easy-to-use platform for organising and storing information. It is an opinionated wiki system that provides a pleasant and simple out of the box experience.
 
 BookStack is built using PHP, on top of the Laravel framework and it uses MySQL to store data.
 
-**Shipped version:** 21.04.3
+**Shipped version:** 21.04.4
 
 ## Screenshots
 
diff --git a/README_fr.md b/README_fr.md
index 9fa7789..cbb5456 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -6,12 +6,12 @@
 *[Read this readme in english.](./README.md)* 
 
 > *Ce package vous permet d'installer BookStack rapidement et simplement sur un serveur YunoHost.  
-Si vous n'avez pas YunoHost, consultez [le guide](https://yunohost.org/#/install) pour apprendre comment l'installer.*
+Si vous n'avez pas YunoHost, consultez [le guide](https://yunohost.org/install) pour apprendre comment l'installer.*
 
 ## Overview
 BookStack est une plate-forme simple, auto-hébergée et facile à utiliser pour organiser et stocker des informations.
 
-**Version incluse :** 21.04.3
+**Version incluse :** 21.04.4
 
 ## Screenshots
 
diff --git a/conf/app.src b/conf/app.src
index 6fab4a3..77098a4 100644
--- a/conf/app.src
+++ b/conf/app.src
@@ -1,5 +1,5 @@
-SOURCE_URL=https://github.com/BookStackApp/BookStack/archive/refs/tags/v21.04.3.tar.gz
-SOURCE_SUM=5c2bfa20c0226587d552c76f33593ed9bfe2d5db36243320790cafa12041a09d
+SOURCE_URL=https://github.com/BookStackApp/BookStack/archive/refs/tags/v21.04.4.tar.gz
+SOURCE_SUM=c8b4a13596f0d4c9992594b79a0bd8e911efb483ebb1eb06895d50edd40a583e
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=true
diff --git a/manifest.json b/manifest.json
index d841077..103d774 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,7 +6,7 @@
         "en": "Platform to create documentation/wiki content",
         "fr": "Plateforme pour créer du contenu de documentation/wiki "
     },
-    "version": "21.04.3~ynh1",
+    "version": "21.04.4~ynh1",
     "url": "https://www.bookstackapp.com/",
     "license": "MIT",
     "maintainer": {
@@ -14,7 +14,7 @@
         "email": "liberodark@gmail.com"
     },
     "requirements": {
-        "yunohost": ">= 4.1.7"
+        "yunohost": ">= 4.2.4"
     },
     "multi_instance": false,
     "services": [
diff --git a/scripts/_common.sh b/scripts/_common.sh
index 3c665c5..7247d75 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -8,6 +8,8 @@ YNH_PHP_VERSION="7.3"
 
 extra_php_dependencies="php${YNH_PHP_VERSION}-mysql php${YNH_PHP_VERSION}-ldap php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-tidy php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-zip php${YNH_PHP_VERSION}-gd"
 
+YNH_COMPOSER_VERSION=1.10.17
+
 #=================================================
 # PERSONAL HELPERS
 #=================================================
@@ -19,64 +21,3 @@ extra_php_dependencies="php${YNH_PHP_VERSION}-mysql php${YNH_PHP_VERSION}-ldap p
 #=================================================
 # FUTURE OFFICIAL HELPERS
 #=================================================
-
-
-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 2>&1 \
-        | COMPOSER_HOME="$workdir/.composer" \
-        php${phpversion} -- --quiet --install-dir="$workdir" --version=$composerversion \
-        || ynh_die "Unable to install Composer." 2>&1
-
-    # 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."
-}
diff --git a/scripts/install b/scripts/install
index 9fcb0a8..cb8e47c 100644
--- a/scripts/install
+++ b/scripts/install
@@ -123,8 +123,9 @@ popd
 #=================================================
 
 # Set permissions to app files
-chown -R $app: $final_path
-chmod -R 755 $final_path
+chmod 755 $final_path
+chown -R $app:www-data $final_path
+chmod -R o-rwx $final_path
 chmod 600 $final_path/.env
 
 #=================================================
diff --git a/scripts/restore b/scripts/restore
index d373002..3c96378 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -67,8 +67,9 @@ ynh_restore_file --origin_path="$final_path"
 #=================================================
 
 # Restore permissions on app files
-chown -R $app: $final_path
-chmod -R 755 $final_path
+chmod 755 $final_path
+chown -R $app:www-data $final_path
+chmod -R o-rwx $final_path
 chmod 600 $final_path/.env
 
 #=================================================
diff --git a/scripts/upgrade b/scripts/upgrade
index 00e9101..901c749 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -122,8 +122,9 @@ popd
 #=================================================
 
 # Set permissions on app files
-chown -R $app: $final_path
-chmod -R 755 $final_path
+chmod 755 $final_path
+chown -R $app:www-data $final_path
+chmod -R o-rwx $final_path
 chmod 600 $final_path/.env
 
 #=================================================