Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Mise à jour du script d'installation #6531

Merged
merged 2 commits into from
Oct 7, 2023
Merged

Mise à jour du script d'installation #6531

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e497bc9
Mise à jour du script d'installation
Situphen Oct 1, 2023
6e3c730
Merge branch 'dev' into install-update
philippemilink Oct 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions scripts/define_variable.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion scripts/dependencies/arch.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion scripts/dependencies/debian.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion scripts/dependencies/fedora.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion scripts/dependencies/ubuntu.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions scripts/install_zds.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down