From 2aff1d2d802f1f5ce4a256cd01f84c6e3b9dd7f6 Mon Sep 17 00:00:00 2001
From: yalh76 <yalh@yahoo.com>
Date: Tue, 18 May 2021 02:53:36 +0200
Subject: [PATCH] Fix variables

---
 manifest.json   |  2 +-
 scripts/install | 16 +++++++++++-----
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/manifest.json b/manifest.json
index c4e9f51..7fa8f83 100644
--- a/manifest.json
+++ b/manifest.json
@@ -14,7 +14,7 @@
         "url": "https://github.com/YunoHost-Apps/invoiceninja_ynh/"
     },
     "requirements": {
-        "yunohost": ">= 3.5"
+        "yunohost": ">= 4.1.0"
     },
     "multi_instance": true,
     "services": [
diff --git a/scripts/install b/scripts/install
index 9f43c0a..49fa5e7 100755
--- a/scripts/install
+++ b/scripts/install
@@ -30,6 +30,12 @@ language=$YNH_APP_ARG_LANGUAGE
 
 app=$YNH_APP_INSTANCE_NAME
 
+api_secret="$(ynh_string_random --length=32)"
+app_key="$(ynh_string_random --length=32)"
+phantomjs_key=$(ynh_string_random --length=32)
+mail_from_address="$(ynh_user_get_info $admin mail)"
+mail_from_name="$(ynh_user_get_info $admin firstname) $(ynh_user_get_info $admin lastname)"
+
 #=================================================
 # CHECK IF THE APP CAN BE INSTALLED WITH THESE ARGS
 #=================================================
@@ -51,12 +57,12 @@ ynh_app_setting_set --app=$app --key=path --value=$path_url
 ynh_app_setting_set --app=$app --key=admin --value=$admin
 ynh_app_setting_set --app=$app --key=language --value=$language
 
-ynh_app_setting_set --app=$app --key=api_secret --value="$(ynh_string_random --length=32)"
-ynh_app_setting_set --app=$app --key=app_key --value="$(ynh_string_random --length=32)"
-ynh_app_setting_set --app=$app --key=phantomjs_key --value="$(ynh_string_random --length=32)"
+ynh_app_setting_set --app=$app --key=api_secret --value=$api_secret
+ynh_app_setting_set --app=$app --key=app_key --value=$app_key
+ynh_app_setting_set --app=$app --key=phantomjs_key --value=$phantomjs_key
 
-ynh_app_setting_set --app=$app --key=mail_from_address --value="$(ynh_user_get_info $admin mail)"
-ynh_app_setting_set --app=$app --key=mail_from_name --value="$(ynh_user_get_info $admin firstname) $(ynh_user_get_info $admin lastname)"
+ynh_app_setting_set --app=$app --key=mail_from_address --value=$mail_from_address
+ynh_app_setting_set --app=$app --key=mail_from_name --value=$mail_from_name
 
 #=================================================
 # STANDARD MODIFICATIONS