From aca78ef82adc929f0e8743ac35b85829a319a4bb Mon Sep 17 00:00:00 2001
From: Gredin67 <35761345+Gredin67@users.noreply.github.com>
Date: Wed, 23 Dec 2020 09:07:37 +0100
Subject: [PATCH] Testing (#20)

* not use synapse set_admin_user action

* preinstall synapse master
---
 check_process   | 3 +--
 scripts/install | 9 +++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/check_process b/check_process
index e90a0bb..0fdec9b 100644
--- a/check_process
+++ b/check_process
@@ -20,8 +20,7 @@
 		sudo yunohost tools update --apps
 		sudo yunohost domain add $domain
 		sudo yunohost domain add $server_name
-		sudo yunohost app install https://github.com/YunoHost-Apps/synapse_ynh/tree/testing -a "domain=$domain&server_name=$server_name&is_public=$is_public&jitsi_server=$jitsi_server" --force
-#		sudo yunohost app install https://github.com/tituspijean/zerotier_ynh --force
+		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
 		# mautrix_whatsapp manifest parameters
 		port="8449"	(PORT)
diff --git a/scripts/install b/scripts/install
index ffb1e8e..7ba7a3d 100755
--- a/scripts/install
+++ b/scripts/install
@@ -99,11 +99,12 @@ ynh_script_progression --message="Installing dependencies..." --weight=97
 ###		- As well as the section "REINSTALL DEPENDENCIES" in the restore script
 ###		- And the section "UPGRADE DEPENDENCIES" in the upgrade script
 
-ynh_install_extra_app_dependencies --repo="http://http.debian.net/debian buster-backports main" --package="golang"
+ynh_install_app_dependencies $pkg_dependencies
+
+ynh_install_extra_app_dependencies --repo="http://http.debian.net/debian buster-backports main" --package="golang-go"
 ynh_install_extra_app_dependencies --repo="http://http.debian.net/debian buster-backports main" --package="libolm-dev"
 #ynh_install_extra_app_dependencies --repo="http://http.debian.net/debian $(lsb_release -sc)" --package="golang-1.11"
 
-ynh_install_app_dependencies $pkg_dependencies
 
 #=================================================
 # CREATE A POSTGRESQL DATABASE
@@ -396,8 +397,8 @@ sleep 30
     # (Note that, by default, non-admins might not have your homeserver's permission to create communities.)
     if [ "$bot_is_synapse_admin" = "Yes" ]
     then
-#    ynh_psql_execute_as_root --database=$synapse_db_name --sql="UPDATE users SET admin = 1 WHERE name = '@$whatsappbot:$server_name';"
-    yunohost app action run $synapse_instance set_admin_user -a username=$whatsappbot
+    ynh_psql_execute_as_root --database=$synapse_db_name --sql="UPDATE users SET admin = 1 WHERE name = '@$whatsappbot:$server_name';"
+    #yunohost app action run $synapse_instance set_admin_user -a username=$whatsappbot
     fi
 ynh_systemd_action --service_name=$app --action="restart"