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

L'installeur en version complète ne persiste plus définitivement le PATH du moment de l'installation du JDK #5944

Merged
merged 2 commits into from Dec 17, 2020
Merged

L'installeur en version complète ne persiste plus définitivement le PATH du moment de l'installation du JDK #5944

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5870fe2
L'installeur en version complète ne persiste plus définitivement le PATH
AmauryCarrade Oct 4, 2020
bb5beca
Merge branch 'dev' into fix-installation-script-trickery-that-persist…
Situphen Dec 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion scripts/install_zds.sh
View file
Open in desktop
Expand Up @@ -298,7 +298,7 @@ if ! $(_in "-jdk-local" $@) && ( $(_in "+jdk-local" $@) || $(_in "+full" $@) );
export ES_JAVA_OPTS="-Xms512m -Xmx512m"

if [[ $(grep -c -i "export JAVA_HOME" $ZDS_ENV/bin/activate) == "0" ]]; then # add java to venv activate's
ACTIVATE_JAVA="export PATH=\"$PATH:$jdk_path/bin\"\nexport JAVA_HOME=\"$jdk_path\"\nexport ES_JAVA_OPTS=\"-Xms512m -Xmx512m\""
ACTIVATE_JAVA="export PATH=\"\$PATH:$jdk_path/bin\"\nexport JAVA_HOME=\"$jdk_path\"\nexport ES_JAVA_OPTS=\"-Xms512m -Xmx512m\""

echo -e $ACTIVATE_JAVA >> $ZDS_ENV/bin/activate
echo -e $ACTIVATE_JAVA >> $ZDS_ENV/bin/activate.csh
Expand Down