From 398e63096e170cb1808e2e467b631c53b88ace2f Mon Sep 17 00:00:00 2001
From: Situphen <Situphen@users.noreply.github.com>
Date: Sat, 7 Oct 2023 23:07:32 +0200
Subject: [PATCH] =?UTF-8?q?Mise=20=C3=A0=20jour=20du=20script=20d'installa?=
 =?UTF-8?q?tion=20(#6531)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 scripts/define_variable.sh      | 8 ++++++--
 scripts/dependencies/arch.txt   | 2 +-
 scripts/dependencies/debian.txt | 2 +-
 scripts/dependencies/fedora.txt | 2 +-
 scripts/dependencies/ubuntu.txt | 2 +-
 scripts/install_zds.sh          | 4 ++--
 6 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/scripts/define_variable.sh b/scripts/define_variable.sh
index 84a1db17ab..152f813a1b 100755
--- a/scripts/define_variable.sh
+++ b/scripts/define_variable.sh
@@ -4,10 +4,14 @@ if [[ $ZDS_VENV == "" ]]; then
     ZDS_VENV="zdsenv"
 fi
 
+if [[ $ZDS_VENV_VERSION == "" ]]; then
+    ZDS_VENV_VERSION="20.24.5"
+fi
+
 ZDS_NODE_VERSION=$(cat $ZDSSITE_DIR/.nvmrc)
 
 if [[ $ZDS_NVM_VERSION == "" ]]; then
-    ZDS_NVM_VERSION="0.33.11"
+    ZDS_NVM_VERSION="0.39.5"
 fi
 
 if [[ $ZDS_ELASTIC_VERSION == "" ]]; then
@@ -19,7 +23,7 @@ if [[ $ZDS_LATEX_REPO == "" ]]; then
 fi
 
 if [[ $ZDS_JDK_VERSION == "" ]]; then
-    ZDS_JDK_VERSION="11.0.14.1"
+    ZDS_JDK_VERSION="11.0.20.1"
     # shellcheck disable=SC2034
     ZDS_JDK_REV="1"
 fi
diff --git a/scripts/dependencies/arch.txt b/scripts/dependencies/arch.txt
index aa51fc6a23..0a590ffc31 100644
--- a/scripts/dependencies/arch.txt
+++ b/scripts/dependencies/arch.txt
@@ -1,5 +1,5 @@
 #title=Arch
-#desc=Utilisation de pacman / Testé sur Arch
+#desc=Utilisation de pacman / Non testé sur les versions récentes
 #updatecmd=pacman -Syu --noconfirm
 #installcmd=pacman -S --noconfirm
 git
diff --git a/scripts/dependencies/debian.txt b/scripts/dependencies/debian.txt
index 6d69be2927..6a43789256 100644
--- a/scripts/dependencies/debian.txt
+++ b/scripts/dependencies/debian.txt
@@ -1,5 +1,5 @@
 #title=Debian
-#desc=Utilisation de apt-get / Testé sur Debian Buster (10), Bullseye (11), Bookworm (12)
+#desc=Utilisation de apt-get / Testé sur Debian Bullseye (11), Bookworm (12)
 #updatecmd=apt-get -y update
 #installcmd=apt-get -y install
 git
diff --git a/scripts/dependencies/fedora.txt b/scripts/dependencies/fedora.txt
index b9e10f1430..e83c900f75 100644
--- a/scripts/dependencies/fedora.txt
+++ b/scripts/dependencies/fedora.txt
@@ -1,5 +1,5 @@
 #title=Fedora
-#desc=Utilisation de dnf / Testé sur Fedora 29, 30
+#desc=Utilisation de dnf / Non testé sur les versions récentes
 #installcmd=dnf -y install
 git
 wget
diff --git a/scripts/dependencies/ubuntu.txt b/scripts/dependencies/ubuntu.txt
index 78fb400942..3ac95dd75a 100644
--- a/scripts/dependencies/ubuntu.txt
+++ b/scripts/dependencies/ubuntu.txt
@@ -1,5 +1,5 @@
 #title=Ubuntu
-#desc=Utilisation de apt-get / Testé sur : 18.04 LTS, 19.04, 20.04 LTS & Linux Mint 19
+#desc=Utilisation de apt-get / Testé sur : 22.04 LTS
 #updatecmd=apt-get -y update
 #installcmd=apt-get -y install
 git
diff --git a/scripts/install_zds.sh b/scripts/install_zds.sh
index 822d4f180d..4d514a3cdb 100755
--- a/scripts/install_zds.sh
+++ b/scripts/install_zds.sh
@@ -147,8 +147,8 @@ if  ! $(_in "-virtualenv" $@) && ( $(_in "+virtualenv" $@) || $(_in "+base" $@)
             fi
         fi
 
-        print_info "* [+virtualenv] installing \`virtualenv 16.2.0\` with pip"
-        pip3 install --user virtualenv==16.2.0
+        print_info "* [+virtualenv] installing \`virtualenv $ZDS_VENV_VERSION\` with pip"
+        pip3 install --user virtualenv==$ZDS_VENV_VERSION
 
         print_info "* [+virtualenv] creating virtualenv"
         err=$(python3 -m venv $ZDS_VENV 3>&1 1>&2 2>&3 | sudo tee /dev/stderr)