From 08a5b22c9c58dc854852a8f1f78548f3acacccc7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Sun, 3 Jan 2021 15:51:09 +0100
Subject: [PATCH 1/3] Hot fix (#57)

* Remove -- deployment that make upgrade to fail
* Stop before removing the systemd service
---
 check_process   |  6 +++---
 manifest.json   |  4 ++--
 scripts/remove  | 16 ++++++++--------
 scripts/upgrade |  7 ++++---
 4 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/check_process b/check_process
index 6d1f2ae..75ae2d2 100644
--- a/check_process
+++ b/check_process
@@ -21,7 +21,7 @@
         setup_private=1
         setup_public=1
         upgrade=1
-        upgrade=1	from_commit=4c29aa94f9d9048411c6e165e122e03574fb9b8d
+        upgrade=1	from_commit=ec8858ed0d054049a0c8f46c6126ee8ae0798e8f
         backup_restore=1
         multi_instance=0
         port_already_use=1	(8095)
@@ -32,6 +32,6 @@
 Email=
 Notification=change
 ;;; Upgrade options
-    ; commit=4c29aa94f9d9048411c6e165e122e03574fb9b8d
-        name=08 Sep 2017 4c29aa94f9d9048411c6e165e122e03574fb9b8d
+    ; commit=ec8858ed0d054049a0c8f46c6126ee8ae0798e8f
+        name=22 May 2020 ec8858ed0d054049a0c8f46c6126ee8ae0798e8f
         manifest_arg=domain=DOMAIN&path=PATH&admin=USER&is_public=1&always_encrypt=1&
diff --git a/manifest.json b/manifest.json
index 8e01235..9a0d7b4 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,9 +6,9 @@
         "en": "Self hosting images and sharing anonymous application",
         "fr": "Application d'hébergement et de partage d'images anonyme"
     },
-    "version": "0.12.1~ynh1",
+    "version": "0.12.1~ynh2",
     "url": "https://lut.im",
-    "license": "AGPL-3.0",
+    "license": "AGPL-3.0-only",
     "maintainer": {
         "name": "None...",
         "email": ""
diff --git a/scripts/remove b/scripts/remove
index 2dab54d..866272f 100644
--- a/scripts/remove
+++ b/scripts/remove
@@ -21,14 +21,6 @@ final_path=$(ynh_app_setting_get --app=$app --key=final_path)
 
 #=================================================
 # STANDARD REMOVE
-#=================================================
-# STOP AND REMOVE SERVICE
-#=================================================
-ynh_script_progression --message="Stopping and removing the systemd service..." --weight=6
-
-# Remove the dedicated systemd config
-ynh_remove_systemd_config
-
 #=================================================
 # REMOVE SERVICE FROM ADMIN PANEL
 #=================================================
@@ -40,6 +32,14 @@ then
 	yunohost service remove $app
 fi
 
+#=================================================
+# STOP AND REMOVE SERVICE
+#=================================================
+ynh_script_progression --message="Stopping and removing the systemd service..." --weight=6
+
+# Remove the dedicated systemd config
+ynh_remove_systemd_config
+
 #=================================================
 # REMOVE DEPENDENCIES
 #=================================================
diff --git a/scripts/upgrade b/scripts/upgrade
index 5fa528b..13824eb 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -266,9 +266,10 @@ ynh_replace_string --match_string="__APP__" --replace_string="$app" --target_fil
 if [ "$upgrade_type" == "UPGRADE_APP" ]
 then
     ynh_script_progression --message="Upgrading $app with Carton..." --weight=4
-    (cd $final_path
-    ynh_secure_remove --file="$final_path/local"
-    carton install --deployment --without=mysql --without=htpasswd --without=test)
+    pushd "$final_path"
+        ynh_secure_remove --file="$final_path/local"
+        carton install --without=mysql --without=htpasswd --without=test
+    popd
 fi
 
 #=================================================

From 727401acb9cab75556573b6b80046d8a64499d40 Mon Sep 17 00:00:00 2001
From: Alexandre Aubin <alex.aubin@mailoo.org>
Date: Sat, 9 Jan 2021 22:44:31 +0100
Subject: [PATCH 2/3] Finding an available port

---
 scripts/install | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/install b/scripts/install
index c5d0bfa..81edd90 100644
--- a/scripts/install
+++ b/scripts/install
@@ -61,7 +61,7 @@ ynh_app_setting_set --app=$app --key=admin_mail_html --value=1
 #=================================================
 # FIND AND OPEN A PORT
 #=================================================
-ynh_script_progression --message="Configuring firewall..." --weight=3
+ynh_script_progression --message="Finding an available port..." --weight=3
 
 # Find a free port
 port=$(ynh_find_port --port=8095)

From 3d3c60abef1555351af9170ec57a6e3872e85e3b Mon Sep 17 00:00:00 2001
From: yalh76 <yalh@yahoo.com>
Date: Sun, 14 Mar 2021 21:27:09 +0100
Subject: [PATCH 3/3] Update manifest.json

---
 manifest.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifest.json b/manifest.json
index 9a0d7b4..c3e7890 100644
--- a/manifest.json
+++ b/manifest.json
@@ -10,7 +10,7 @@
     "url": "https://lut.im",
     "license": "AGPL-3.0-only",
     "maintainer": {
-        "name": "None...",
+        "name": "",
         "email": ""
     },
     "previous_maintainers": [{