From f61017ac3d65d3d6a54f56572df1c389f38c5b28 Mon Sep 17 00:00:00 2001
From: yalh76 <yalh@yahoo.com>
Date: Sun, 9 Oct 2022 02:18:18 +0200
Subject: [PATCH] Fix upgrade

---
 demo_upgrade.sh                                | 2 +-
 upgrade.d/Constant_upgrade/Disable_add_domain  | 2 +-
 upgrade.d/Constant_upgrade/Disable_custom_apps | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/demo_upgrade.sh b/demo_upgrade.sh
index e06cb1d..bd38c3c 100755
--- a/demo_upgrade.sh
+++ b/demo_upgrade.sh
@@ -128,7 +128,7 @@ UPGRADE_DEMO_CONTAINER () {		# Démarrage, upgrade et snapshot
 	# Upgrade des apps
 	sudo lxc-attach -n $MACHINE -- yunohost tools update
 	sudo lxc-attach -n $MACHINE -- systemctl restart nginx
-	sudo lxc-attach -n $MACHINE -- yunohost tools upgrade --apps
+	sudo lxc-attach -n $MACHINE -- yunohost tools upgrade apps
 	sudo lxc-attach -n $MACHINE -- systemctl restart nginx
 
 	# Arrêt de la machine virtualisée
diff --git a/upgrade.d/Constant_upgrade/Disable_add_domain b/upgrade.d/Constant_upgrade/Disable_add_domain
index 0638bf2..50a5b0a 100644
--- a/upgrade.d/Constant_upgrade/Disable_add_domain
+++ b/upgrade.d/Constant_upgrade/Disable_add_domain
@@ -6,4 +6,4 @@ if [ "${0:0:1}" == "/" ]; then script_dir="$(dirname "$0")"; else script_dir="$P
 MACHINE=$1      # Nom du conteneur
 
 # Désactive l'ajout de domaine, pour éviter surtout les nohost
-sed -i "s@<input type=\"submit\" role=\"button\" class=\"btn btn-success slide back\" value=\"{{t 'add'}}\">@<input type=\"\" role=\"\" class=\"btn btn-success slide back\" value=\"{{t 'add'}}\">@g" /var/lib/lxc/$MACHINE/rootfs/usr/share/yunohost/admin/views/domain/domain_add.ms
+#sed -i "s@<input type=\"submit\" role=\"button\" class=\"btn btn-success slide back\" value=\"{{t 'add'}}\">@<input type=\"\" role=\"\" class=\"btn btn-success slide back\" value=\"{{t 'add'}}\">@g" /var/lib/lxc/$MACHINE/rootfs/usr/share/yunohost/admin/views/domain/domain_add.ms
diff --git a/upgrade.d/Constant_upgrade/Disable_custom_apps b/upgrade.d/Constant_upgrade/Disable_custom_apps
index 385f31b..fc64630 100644
--- a/upgrade.d/Constant_upgrade/Disable_custom_apps
+++ b/upgrade.d/Constant_upgrade/Disable_custom_apps
@@ -6,4 +6,4 @@ if [ "${0:0:1}" == "/" ]; then script_dir="$(dirname "$0")"; else script_dir="$P
 MACHINE=$1      # Nom du conteneur
 
 # Désactive l'installation d'app custom
-sed -i "s@<a role=\"button\" class=\"btn btn-success slide\">{{t 'install'}}</a>@<a role=\"\" class=\"btn btn-success slide\">{{t 'install'}}</a>@g" /var/lib/lxc/$MACHINE/rootfs/usr/share/yunohost/admin/views/app/app_catalog_category.ms
+#sed -i "s@<a role=\"button\" class=\"btn btn-success slide\">{{t 'install'}}</a>@<a role=\"\" class=\"btn btn-success slide\">{{t 'install'}}</a>@g" /var/lib/lxc/$MACHINE/rootfs/usr/share/yunohost/admin/views/app/app_catalog_category.ms