From 73072c8e62e14865351c3f9ec3b9f94dcd0aa7b3 Mon Sep 17 00:00:00 2001
From: yalh76 <yalh@yahoo.com>
Date: Thu, 10 Mar 2022 01:39:42 +0100
Subject: [PATCH 1/2] Apply example_ynh

---
 check_process      |   3 +++
 conf/app.src       |   2 ++
 doc/.DS_Store      | Bin 6148 -> 0 bytes
 manifest.json      |   2 +-
 scripts/backup     |   2 +-
 scripts/change_url |  14 +++++++-------
 scripts/install    |   2 +-
 scripts/remove     |   2 +-
 scripts/restore    |   6 +++---
 scripts/upgrade    |   8 ++++----
 10 files changed, 23 insertions(+), 18 deletions(-)
 delete mode 100644 doc/.DS_Store

diff --git a/check_process b/check_process
index 90bfdf3..a545cbf 100644
--- a/check_process
+++ b/check_process
@@ -11,8 +11,11 @@
 		setup_private=1
 		setup_public=1
 		upgrade=1
+		# 3.0.4~ynh2
+		upgrade=1	from_commit=db9a6b110a2d2b5f4a7010159d20b3d0cda1b74b
 		backup_restore=1
 		multi_instance=1
+		port_already_use=0
 		change_url=1
 ;;; Options
 Email=anmol@datamol.org
diff --git a/conf/app.src b/conf/app.src
index 658b3db..7e5dd24 100644
--- a/conf/app.src
+++ b/conf/app.src
@@ -3,3 +3,5 @@ SOURCE_SUM=12d59901d2c221bbbfbff95036c9c4023b4629cca5a63aa8750739a7b22f1ed8
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=true
+SOURCE_FILENAME=
+SOURCE_EXTRACT=true
diff --git a/doc/.DS_Store b/doc/.DS_Store
deleted file mode 100644
index b5e9f0085dbef67b8e881ecebc38d1c00cec3684..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6148
zcmeHK!Ab)$5S`SjyA-hpL65n3>!GDpPr_2`!JDw62Nm6Q7rRh5(%o9LR`xgakNg6E
z$C)Ipl<G+kDKla6CX<<jye!EE07QEbH2|sr;GhzgT&%tk>L;C(lJyV@Jw^;EWY7f#
z`CK$R{v!jlcNN^T8|Xuf<!k@4aG2ePJr!cadwAbVvb<jZ5T&K^^2(~?Vp(%8{jM7N
zd5{mXcF;ek)^U(`Lu;QX)tlNuc$&n+tLnyqO7kE|<GxN#q8LLi&XP1z!?qfvQKrZ7
zO$W{6URAe7qh@obCY!C+xF$z?d-a-ZHFw8j*V)`|>>pj<JwA<|$1ksjV}YNemUW90
zcthid<v#fRw5QTrjF@CkvKW~GW`G%3Fb3=~=TsJKUA!D-fEoBb19Uz}R6@^UVNf3(
zSkdnz^_K}r(5ANpp|t2(EDT}~iZH2&CRNxchA`>qmp0C`SQs?vAoR>Qj-6T97mCoc
zqhIQ95S~G<nE_^CmVqVHtkV5|`1AXJHi=uz05h;q42W{a@3e7A_HLb99No1N^%|9g
o;tGS)6g2czjIneTZ=q^Iza#_Evsf5J4+{SXXd1X;2L6<RPZ$VQF8}}l

diff --git a/manifest.json b/manifest.json
index e95f231..3e9e44d 100644
--- a/manifest.json
+++ b/manifest.json
@@ -28,7 +28,7 @@
         "nginx"
     ],
     "arguments": {
-        "install" : [
+        "install": [
             {
                 "name": "domain",
                 "type": "domain"
diff --git a/scripts/backup b/scripts/backup
index 87e89d3..6201eec 100755
--- a/scripts/backup
+++ b/scripts/backup
@@ -6,7 +6,7 @@
 # IMPORT GENERIC HELPERS
 #=================================================
 
-#Keep this path for calling _common.sh inside the execution's context of backup and restore scripts
+# Keep this path for calling _common.sh inside the execution's context of backup and restore scripts
 source ../settings/scripts/_common.sh
 source /usr/share/yunohost/helpers
 
diff --git a/scripts/change_url b/scripts/change_url
index b7addbc..211d42d 100644
--- a/scripts/change_url
+++ b/scripts/change_url
@@ -30,7 +30,7 @@ ynh_script_progression --message="Loading installation settings..."
 final_path=$(ynh_app_setting_get --app=$app --key=final_path)
 
 #=================================================
-# BACKUP BEFORE UPGRADE THEN ACTIVE TRAP
+# BACKUP BEFORE CHANGE URL THEN ACTIVE TRAP
 #=================================================
 ynh_script_progression --message="Backing up the app before changing its URL (may take a while)..."
 
@@ -40,7 +40,7 @@ ynh_clean_setup () {
 	# Remove the new domain config file, the remove script won't do it as it doesn't know yet its location.
 	ynh_secure_remove --file="/etc/nginx/conf.d/$new_domain.d/$app.conf"
 
-	# restore it if the upgrade fails
+	# Restore it if the upgrade fails
 	ynh_restore_upgradebackup
 }
 # Exit if an error occurs during the execution of the script
@@ -71,19 +71,19 @@ ynh_script_progression --message="Updating NGINX web server configuration..."
 
 nginx_conf_path=/etc/nginx/conf.d/$old_domain.d/$app.conf
 
-# Change the path in the nginx config file
+# Change the path in the NGINX config file
 if [ $change_path -eq 1 ]
 then
-	# Make a backup of the original nginx config file if modified
+	# Make a backup of the original NGINX config file if modified
 	ynh_backup_if_checksum_is_different --file="$nginx_conf_path"
-	# Set global variables for nginx helper
+	# Set global variables for NGINX helper
 	domain="$old_domain"
 	path_url="$new_path"
-	# Create a dedicated nginx config
+	# Create a dedicated NGINX config
 	ynh_add_nginx_config
 fi
 
-# Change the domain for nginx
+# Change the domain for NGINX
 if [ $change_domain -eq 1 ]
 then
 	# Delete file checksum for the old conf file location
diff --git a/scripts/install b/scripts/install
index 6096664..c9f5436 100755
--- a/scripts/install
+++ b/scripts/install
@@ -71,7 +71,7 @@ chown -R $app:www-data "$final_path"
 #=================================================
 ynh_script_progression --message="Configuring NGINX web server..."
 
-# Create a dedicated nginx config
+# Create a dedicated NGINX config
 ynh_add_nginx_config
 
 #=================================================
diff --git a/scripts/remove b/scripts/remove
index 781098a..dfa828c 100755
--- a/scripts/remove
+++ b/scripts/remove
@@ -34,7 +34,7 @@ ynh_secure_remove --file="$final_path"
 #=================================================
 ynh_script_progression --message="Removing NGINX web server configuration..."
 
-# Remove the dedicated nginx config
+# Remove the dedicated NGINX config
 ynh_remove_nginx_config
 
 #=================================================
diff --git a/scripts/restore b/scripts/restore
index 2492a06..5d386cf 100755
--- a/scripts/restore
+++ b/scripts/restore
@@ -6,7 +6,7 @@
 # IMPORT GENERIC HELPERS
 #=================================================
 
-#Keep this path for calling _common.sh inside the execution's context of backup and restore scripts
+# Keep this path for calling _common.sh inside the execution's context of backup and restore scripts
 source ../settings/scripts/_common.sh
 source /usr/share/yunohost/helpers
 
@@ -20,7 +20,7 @@ ynh_abort_if_errors
 #=================================================
 # LOAD SETTINGS
 #=================================================
-ynh_script_progression --message="Loading settings..."
+ynh_script_progression --message="Loading installation settings..."
 
 app=$YNH_APP_INSTANCE_NAME
 
@@ -41,7 +41,7 @@ test ! -d $final_path \
 #=================================================
 # RESTORE THE NGINX CONFIGURATION
 #=================================================
-ynh_script_progression --message="Restoring the NGINX configuration..."
+ynh_script_progression --message="Restoring the NGINX web server configuration..."
 
 ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf"
 
diff --git a/scripts/upgrade b/scripts/upgrade
index 8df6f5c..1693bc9 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -34,12 +34,14 @@ ynh_script_progression --message="Backing up the app before upgrading (may take
 # Backup the current version of the app
 ynh_backup_before_upgrade
 ynh_clean_setup () {
-	# restore it if the upgrade fails
+	# Restore it if the upgrade fails
 	ynh_restore_upgradebackup
 }
 # Exit if an error occurs during the execution of the script
 ynh_abort_if_errors
 
+#=================================================
+# STANDARD UPGRADE STEPS
 #=================================================
 # ENSURE DOWNWARD COMPATIBILITY
 #=================================================
@@ -66,8 +68,6 @@ ynh_script_progression --message="Making sure dedicated system user exists..."
 # Create a dedicated user (if not existing)
 ynh_system_user_create --username=$app --home_dir="$final_path"
 
-#=================================================
-# STANDARD UPGRADE STEPS
 #=================================================
 # DOWNLOAD, CHECK AND UNPACK SOURCE
 #=================================================
@@ -89,7 +89,7 @@ chown -R $app:www-data "$final_path"
 #=================================================
 ynh_script_progression --message="Upgrading NGINX web server configuration..."
 
-# Create a dedicated nginx config
+# Create a dedicated NGINX config
 ynh_add_nginx_config
 
 #=================================================

From dca4c3dd51a3b2b9eb1d2e311c575316b7ecf6b8 Mon Sep 17 00:00:00 2001
From: yalh76 <yalh@yahoo.com>
Date: Fri, 11 Mar 2022 01:43:47 +0100
Subject: [PATCH 2/2] switch back source

---
 conf/app.src | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/conf/app.src b/conf/app.src
index 7e5dd24..71ccad7 100644
--- a/conf/app.src
+++ b/conf/app.src
@@ -1,7 +1,7 @@
-SOURCE_URL=https://github.com/jh3y/tyto/archive/refs/tags/3.0.4.tar.gz
-SOURCE_SUM=12d59901d2c221bbbfbff95036c9c4023b4629cca5a63aa8750739a7b22f1ed8
+SOURCE_URL=https://github.com/jh3y/tyto/archive/057781327fcfbfed3cf43da0993c5f4a5816a078.zip
+SOURCE_SUM=cae63ac06dfe555e022fc231549eab0d7cd9d5e8a3235adeff4d5e5a793f134b
 SOURCE_SUM_PRG=sha256sum
-SOURCE_FORMAT=tar.gz
+SOURCE_FORMAT=zip
 SOURCE_IN_SUBDIR=true
 SOURCE_FILENAME=
 SOURCE_EXTRACT=true