From 61340c2d1167c3fc949fd927bca97d9efd8b8500 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Sat, 20 Nov 2021 18:28:33 +0100
Subject: [PATCH] Fix

---
 check_process          |  3 ---
 conf/config_local.php  | 15 ++++++++-------
 conf/cops-deps.control |  2 +-
 manifest.json          | 10 ----------
 scripts/install        |  4 ++--
 5 files changed, 11 insertions(+), 23 deletions(-)

diff --git a/check_process b/check_process
index aa366c2..0ba3281 100644
--- a/check_process
+++ b/check_process
@@ -5,9 +5,6 @@
         admin="john"
         language="fr"
         is_public=1
-        password="password"
-        runninguser="www-data"
-        calibre="/home/yunohost.app/nextcloud/johndoe/"
     ; Checks
         pkg_linter=1
         setup_sub_dir=1
diff --git a/conf/config_local.php b/conf/config_local.php
index 76d8192..03283ac 100644
--- a/conf/config_local.php
+++ b/conf/config_local.php
@@ -14,14 +14,15 @@
      * containing all the formats.
      * BEWARE : it has to end with a /
      */
-    $config['calibre_directory'] = '__CALIBRE__';
-
-    $config['calibre_internal_directory'] = '/Calibre/';
-    
-    $config['cops_full_url'] = '__DOMAIN____PATH__/ '; 
-
-    $config['cops_x_accel_redirect'] = "X-Accel-Redirect";
+    $config['calibre_directory'] = '__DATADIR__';
 
+/*
+*  $config['calibre_internal_directory'] = '/Calibre/';
+*   
+*  $config['cops_full_url'] = '__DOMAIN____PATH__/ '; 
+*
+*   $config['cops_x_accel_redirect'] = "X-Accel-Redirect";
+*/
     /*
      * Catalog's title
      */
diff --git a/conf/cops-deps.control b/conf/cops-deps.control
index bf289c4..fbeb9c3 100644
--- a/conf/cops-deps.control
+++ b/conf/cops-deps.control
@@ -5,7 +5,7 @@ Standards-Version: 1.0.1
 
 Package: cops-deps
 Version: 1.2-1
-Depends: php5-gd, php5-sqlite, php5-json, php5-intl
+Depends: php7.3-gd, php7.3-sqlite, php7.3-json, php7.3-intl
 Architecture: all
 Description: meta package for cops dependencies
  COPS stands for Calibre OPDS (and HTML) Php Server.
diff --git a/manifest.json b/manifest.json
index c7f257e..ef63047 100644
--- a/manifest.json
+++ b/manifest.json
@@ -49,16 +49,6 @@
                 "choices": ["fr", "en"],
                 "default": "fr"
             },
-            {
-                "name": "calibre",
-                "type": "string",
-                "ask": {
-                    "en": "Indicate the location of Calibre library. DON'T store it in your /var/www/cops or it will be removed on next upgrade !!",
-                    "fr": "Indiquez le chemin de votre bibliotheque Calibre. Ne la mettez pas dans /var/www/cops ou elle sera supprimée à la prochaine upgrade !!!"
-                },
-                "example": "/home/yunohost.app/owncloud/data/johndoe/files/eBooks",
-                "default": "/home/yunohost.app/owncloud/data/johndoe/files/eBooks"
-            },
             {
                 "name": "is_public",
                 "type": "boolean",
diff --git a/scripts/install b/scripts/install
index 5cb1ec4..5b34282 100755
--- a/scripts/install
+++ b/scripts/install
@@ -29,7 +29,7 @@ path_url=$YNH_APP_ARG_PATH
 is_public=$YNH_APP_ARG_IS_PUBLIC
 language=$YNH_APP_ARG_LANGUAGE
 timezone="$(cat /etc/timezone)"
-calibre=$YNH_APP_ARG_CALIBRE
+phpversion=$YNH_PHP_VERSION
 
 app=$YNH_APP_INSTANCE_NAME
 
@@ -52,7 +52,7 @@ ynh_script_progression --message="Storing installation settings..." --weight=1
 ynh_app_setting_set --app=$app --key=domain --value=$domain
 ynh_app_setting_set --app=$app --key=path --value=$path_url
 ynh_app_setting_set --app=$app --key=language --value=$language
-ynh_app_setting_set --app=$app --key=calibre --value=$calibre
+ynh_app_setting_set --app=$app --key=phpversion --value=$phpversion
 
 #=================================================
 # INSTALL DEPENDENCIES