From 0a3dbd1498fd63a0ba3d707a9e89a08fbba0ea20 Mon Sep 17 00:00:00 2001
From: Benedikt Tissot <benedikt.tissot@googlemail.com>
Date: Thu, 9 Sep 2021 15:09:55 +0200
Subject: [PATCH] try to make CI work

---
 check_process      | 14 +++++++-------
 manifest.json      |  2 +-
 scripts/_common.sh |  2 +-
 scripts/install    |  4 ++--
 scripts/restore    |  2 +-
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/check_process b/check_process
index d27b611..d00c199 100644
--- a/check_process
+++ b/check_process
@@ -1,14 +1,16 @@
 ;; Default test serie
+	; pre-install
+		sudo yunohost tools update
+		sudo yunohost app list | grep synapse ||  sudo yunohost app install https://github.com/YunoHost-Apps/synapse_ynh/ -a "domain=$domain&server_name=$server_name&is_public=$is_public&jitsi_server=$jitsi_server" --force
 	; Manifest
-		port="8449"
+		port="29317"
 		synapsenumber="1"
 		botname="telegrambot"
 		encryption=false
 		botadmin="@johndoe:synapsedomain.tld"
 		botusers="@johndoe:synapsedomain.tld"
 		apiid="1234567"
-    # this is a random hash so this will not work
-		apihash="tjyd5yge35lbodk1xwzw2jstp90k55qz"
+		apihash="tjyd5yge35lbodl1jwzw2jstp90k55qz"
     bottoken="disabled"
 	; Checks
 		pkg_linter=1
@@ -25,7 +27,5 @@
 		port_already_use=1
 		change_url=0
 ;;; Upgrade options
-#	; commit=636be2f9f900e578d9aa26ee887dcec2ef8d4e71
-#		name=0.1.6
-#	; commit=a95215f2ea5d1f34b1c804f776e78c4785477023
-#		name=0.1.7
+#	; commit=e579544bf977e2b6b4221ecfaf1b1a5c6069560e
+#		name=0.10.1~ynh3
diff --git a/manifest.json b/manifest.json
index 5c2b7ab..ca2c467 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,7 +6,7 @@
 		"en": "Telegram puppeting bridge for Matrix/Synapse",
 		"fr": "Passerelle Telegram pour Matrix/Synapse"
 	},
-	"version": "0.10.1~ynh2",
+	"version": "0.10.1~ynh3",
 	"url": "https://github.com/mautrix/telegram",
 	"license": "AGPL-3.0-or-later",
 	"maintainer": {
diff --git a/scripts/_common.sh b/scripts/_common.sh
index 866202e..d8bd1f0 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -6,7 +6,7 @@
 
 # dependencies used by the app
 # HACK zlib1g-dev libjpeg-dev (libwebp-dev optional but necessary for stickers) are necessary to compile / install pillow
-pkg_dependencies="postgresql python3 zlib1g-dev libjpeg-dev libwebp-dev"
+pkg_dependencies="postgresql python3 zlib1g-dev libjpeg-dev libwebp-dev python3-venv libpq-dev"
 
 #=================================================
 # PERSONAL HELPERS
diff --git a/scripts/install b/scripts/install
index 4612da4..ffb4686 100755
--- a/scripts/install
+++ b/scripts/install
@@ -199,9 +199,9 @@ ynh_replace_string --match_string="script_location = alembic" \
   --target_file="$final_path/alembic.ini"
 $final_path/bin/alembic  -c "$final_path/alembic.ini" -x config="$mautrix_config_path" upgrade head
 
+# Handled by synapse: synapse_ynh adds all registration files added in $app_service_registration_path to the app_service_config_files list
 /opt/yunohost/matrix-$synapse_instance/update_synapse_for_appservice.sh \
     || ynh_die "Synapse can't restart with the appservice configuration"
-# Handled by synapse: synapse_ynh adds all registration files added in $app_service_registration_path to the app_service_config_files list
 
 #=================================================
 # STORE THE CONFIG FILE CHECKSUM
@@ -237,7 +237,7 @@ ynh_script_progression --message="Configuring log rotation..." --weight=3
 
 # Use logrotate to manage application logfile(s)
 # TODO maybe --specific-user??
-ynh_use_logrotate --logfile "/var/log/$app/$app.log" --specific-user $mautrix_bridge_user
+ynh_use_logrotate --logfile "/var/log/$app/$app.log" --specific_user $mautrix_bridge_user
 chown $mautrix_bridge_user:root -R /var/log/$app
 
 #=================================================
diff --git a/scripts/restore b/scripts/restore
index 448afa0..3bc036a 100755
--- a/scripts/restore
+++ b/scripts/restore
@@ -107,7 +107,7 @@ systemctl enable $app.service --quiet
 #=================================================
 ynh_script_progression --message="Integrating service in YunoHost..." --weight=1
 
-yunohost service add $app --description $app daemon for bridging Telegram and Matrix messages --log /var/log/$app/$app.log
+yunohost service add $app --description "$app daemon for bridging Telegram and Matrix messages" --log /var/log/$app/$app.log
 
 #=================================================
 # START SYSTEMD SERVICE