From b3c6175bc5c17d49f5de766539f32d84df519968 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=C3=A9lix=20Pi=C3=A9dallu?= <felix@piedallu.me>
Date: Wed, 18 Jan 2023 19:44:53 +0100
Subject: [PATCH] Bump to 6.5.4 upstream, hoping to fix issues with endi-admin

---
 conf/app.src    |  4 ++--
 manifest.json   |  2 +-
 scripts/install | 15 +++++----------
 3 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/conf/app.src b/conf/app.src
index 74f8171..6f559a5 100644
--- a/conf/app.src
+++ b/conf/app.src
@@ -1,5 +1,5 @@
-SOURCE_URL=https://framagit.org/endi/endi/-/archive/6ad0200603817e2e164c13ec2581746d49896e39/endi-6ad0200603817e2e164c13ec2581746d49896e39.tar.gz
-SOURCE_SUM=fbf62392be556cb3d24c9ef7176a576e105f0bb774bbeb678b8932289e7cb43b
+SOURCE_URL=https://framagit.org/endi/endi/-/archive/8d2d1e9cbc495dd48712d380c9f039a4e5b877dc/endi-8d2d1e9cbc495dd48712d380c9f039a4e5b877dc.tar.gz
+SOURCE_SUM=16fdee654c59c1ce1f914ca5a620fb9cebd3d2bd5e03e9d4442e68a5daf559ae
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=true
diff --git a/manifest.json b/manifest.json
index c8b039e..96a79ef 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,7 +6,7 @@
         "en": "A comptability software for CAE companies (french Communauté d'Activité et d'Emploi)",
         "fr": "Un progiciel de gestion comptable à l'usage des CAE (Communauté d'Activité et d'Emploi)"
     },
-    "version": "1.0~ynh1",
+    "version": "6.5.4~ynh1",
     "url": "https://endi.coop",
     "upstream": {
         "license": "GPLv3",
diff --git a/scripts/install b/scripts/install
index eddfbe3..48e4b4b 100755
--- a/scripts/install
+++ b/scripts/install
@@ -117,9 +117,6 @@ ynh_setup_source --dest_dir="$final_path/endi"
 cython_version=$(cython3 --version 2>&1 | sed 's|Cython version ||')
 sed -i "s|Cython=.*|Cython==$cython_version|" "$final_path/endi/requirements.txt"
 
-# Patch endi-admin command bug
-sed -i "s|arguments.password|arguments.pwd|" "$final_path/endi/endi/scripts/endi_admin.py"
-
 chmod 750 "$final_path"
 chmod -R o-rwx "$final_path"
 chown -R $app:www-data "$final_path"
@@ -188,16 +185,14 @@ ynh_add_systemd_config
 #=================================================
 ynh_script_progression --message="Configuring enDI..." --weight=1
 
-(
-    cd "$final_path"
-
+pushd "$final_path" 2>&1
     ynh_exec_as $app "$final_path/venv/bin/endi-admin" endi.ini syncdb
+
     # ynh_exec_as $app "$final_path/venv/bin/endi-migrate" app.ini syncdb --pkg=endi_payment
 
-    # ynh_exec_as $app "$final_path/venv/bin/endi-admin" endi.ini useradd --group=admin --user="admin" --pwd="$password" \
-    #     --email="admin@$domain"
-
-)
+    ynh_exec_as $app "$final_path/venv/bin/endi-admin" endi.ini useradd --group=admin --user="admin" --pwd="$password" \
+        --email="admin@$domain"
+popd 2>&1
 
 #=================================================
 # GENERIC FINALIZATION