From e8352a457f8d69315423adb3d7f36197ac7610aa Mon Sep 17 00:00:00 2001
From: Alexandre Aubin <alex.aubin@mailoo.org>
Date: Sat, 23 May 2020 23:21:34 +0200
Subject: [PATCH 1/3] Fix funky manifest argument fetching

---
 scripts/install | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/scripts/install b/scripts/install
index d971e61..dbc758d 100755
--- a/scripts/install
+++ b/scripts/install
@@ -6,30 +6,27 @@
 # IMPORT GENERIC HELPERS
 #=================================================
 
+source _common.sh
 source /usr/share/yunohost/helpers
 
 #=================================================
 # RETRIEVE ARGUMENTS FROM THE MANIFEST
 #=================================================
 
+app=$YNH_APP_INSTANCE_NAME
+
 domain=$YNH_APP_ARG_DOMAIN
 path_url=$YNH_APP_ARG_PATH
 admin=$YNH_APP_ARG_ADMIN
 is_public=$YNH_APP_ARG_IS_PUBLIC
 language=$YNH_APP_ARG_LANGUAGE
-app=$YNH_APP_INSTANCE_NAME
-upload=$6
-public_library=$7
+upload=$YNH_APP_ARG_UPLOAD
+public_library=$7YNH_APP_ARG_PUBLIC_LIBRARY
+
 #if app is public, we assume library is public
 if [ $is_public -eq 1 ]; then
 	public_library=1
 fi
-source _common.sh
-
-
-
-source _common.sh
-source /usr/share/yunohost/helpers
 
 #=================================================
 # MANAGE SCRIPT FAILURE

From d2653f918027abe6820864a42dc85a6ee38f072c Mon Sep 17 00:00:00 2001
From: Krakinou <Krakinou@users.noreply.github.com>
Date: Sun, 24 May 2020 09:59:51 +0200
Subject: [PATCH 2/3] Update install

---
 scripts/install | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/scripts/install b/scripts/install
index dbc758d..2a39dd8 100755
--- a/scripts/install
+++ b/scripts/install
@@ -28,6 +28,9 @@ if [ $is_public -eq 1 ]; then
 	public_library=1
 fi
 
+LOG_FILE=/var/log/$app/$app.log
+ACCESS_LOG_FILE=/var/log/$app/$app-access.log
+
 #=================================================
 # MANAGE SCRIPT FAILURE
 #=================================================

From d9ed948a891c3262be0944ce06cfc19db09a1d47 Mon Sep 17 00:00:00 2001
From: Krakinou <Krakinou@users.noreply.github.com>
Date: Sun, 24 May 2020 10:01:30 +0200
Subject: [PATCH 3/3] Update _common.sh

---
 scripts/_common.sh | 2 --
 1 file changed, 2 deletions(-)

diff --git a/scripts/_common.sh b/scripts/_common.sh
index ab8c254..6bf639c 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -3,8 +3,6 @@
 PKG_DEPENDENCIES="sqlite3 libldap2-dev libsasl2-dev python3-dev imagemagick python3-lxml libjpeg-dev"
 #PKG_DEPENDENCIES="sqlite3 python3-pip imagemagick"
 DOSSIER_MEDIA=/home/yunohost.multimedia
-LOG_FILE=/var/log/$app/$app.log
-ACCESS_LOG_FILE=/var/log/$app/$app-access.log
 
 
 #=================================================