From 8c256fe7117b6b381c81582a62338835fd0ea18e Mon Sep 17 00:00:00 2001
From: Emmanuel Viennet <emmanuel.viennet@gmail.com>
Date: Sun, 25 Aug 2024 02:33:16 +0200
Subject: [PATCH] Fix upgrade script

---
 sco_version.py   |  2 +-
 tools/upgrade.sh | 14 ++++++--------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/sco_version.py b/sco_version.py
index 35f4a2342..e0aa0a8f5 100644
--- a/sco_version.py
+++ b/sco_version.py
@@ -1,7 +1,7 @@
 # -*- mode: python -*-
 # -*- coding: utf-8 -*-
 
-SCOVERSION = "9.7.10"
+SCOVERSION = "9.7.11"
 
 SCONAME = "ScoDoc"
 
diff --git a/tools/upgrade.sh b/tools/upgrade.sh
index 93a5de317..38aaba8a2 100755
--- a/tools/upgrade.sh
+++ b/tools/upgrade.sh
@@ -24,14 +24,12 @@ export DEBIAN_FRONTEND=noninteractive
 
 check_uid_root "$0"
 
-if [ -z "$SCODOC_UPGRADE_RUNNING" ]
-   then
-       apt-get update && apt-get -y dist-upgrade
-       # install spécifiquement scodoc9, utile si les dépendances Debian de scodoc9
-       # ont été changées, ce qui peut provoquer un
-       # "packages have been kept back"
-       apt install scodoc9 || alarm_admin "apt install scodoc9 failed"
-fi
+apt-get update && apt-get -y dist-upgrade || alarm_admin "apt-get dist-upgrade failed"
+# install spécifiquement scodoc9, utile si les dépendances Debian de scodoc9
+# ont été changées, ce qui peut provoquer un
+# "packages have been kept back"
+apt install scodoc9 || alarm_admin "apt install scodoc9 failed"
+
 systemctl restart redis
 systemctl restart nginx
 systemctl restart scodoc9