Skip to content

Feature/#24 #25

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

Merged
jabrena merged 7 commits into from
Nov 10, 2018
Merged

Feature/#24 #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
276c514
Allow JRI reinstall/upgrade to same major version
JakubVanek Nov 4, 2018
c213fbf
Update configuration for Java 11
JakubVanek Nov 4, 2018
1f35eb9
Fix JAVA_LATEST undefined error
JakubVanek Nov 10, 2018
3cc540d
Use wget timestamping for cached java archive detection
JakubVanek Nov 10, 2018
a0fb1fd
Fix update-alternatives commands
JakubVanek Nov 10, 2018
811db94
Always reinstall Java
JakubVanek Nov 10, 2018
4d1ec0f
Bump installer revision date
JakubVanek Nov 10, 2018
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
2 changes: 1 addition & 1 deletion installer.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ echo
echo "##############################"
echo "# EV3Dev-lang-java Installer #"
echo "##############################"
echo "# Last update: 2018/04/14 #"
echo "# Last update: 2018/11/10 #"
echo "##############################"
echo

Expand Down
29 changes: 11 additions & 18 deletions modules/java.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,23 +4,22 @@
# Install the latest EV3 JRI bundle
function java_install_bundle() {
if [ -d "$JRI_PATH_NEW" ]; then
echo "Sorry, we detected a previous installation in path: /opt/jri-10-build-050"
echo "Detected a previous installation in path: $JRI_PATH_NEW"
echo "Deleting and reinstalling."
echo
exit 1
rm -rf "$JRI_PATH_NEW"
fi

if [ ! -f "$JRI_ZIP" ]; then
echo "Downloading new Java..."
wget "$JRI_URL" -O "$JRI_ZIP"
else
echo "Java archive found, using cached."
fi
pushd "$(dirname $JRI_ZIP)" >/dev/null
echo "Downloading Java..."
wget -N "$JRI_URL"
popd >/dev/null

# extract it, rename it and point the symlink to it
echo "Java package acquired, installing..."
tar -xf "$JRI_ZIP" -C "$JRI_OPT"
mv "$JRI_PATH_ZIP" "$JRI_PATH_NEW"
update-alternatives --install /usr/bin/java java "$JRI_EXE" "$JRI_PRIORITY"
update-alternatives --install "/usr/bin/java" "java" "$JRI_EXE" "$JRI_PRIORITY"

JAVA_REAL_EXE="$JRI_EXE"
}
Expand Down Expand Up @@ -93,20 +92,14 @@ function java_install() {
JAVA_VERSION="$(echo "$JAVA_VERSION_RAW" | awk -F '"' '/version/ {print $2}')"
JAVA_VERSION_LATEST="${JAVA_LATEST[$PLATFORM]}"

echo "Installed Java version: '${JAVA_VERSION}'"

if [ "$JAVA_VERSION" != "$JAVA_VERSION_LATEST" ]; then
echo "Installing latest Java version ($JAVA_VERSION_LATEST)..."
java_just_install
else
echo "Latest major Java version is installed."
fi
echo "Installed Java version: '${JAVA_VERSION}', latest '${JAVA_VERSION_LATEST}', installing anyway."
java_just_install
}

#############################
# Perform maintenance tasks
function java_postinstall() {
update-alternatives --set "/usr/bin/java" "$JAVA_REAL_EXE"
update-alternatives --set "java" "$JAVA_REAL_EXE"

echo "Output of 'java -version':"
"$JAVA_REAL_EXE" -version
Expand Down
26 changes: 13 additions & 13 deletions modules/vars.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,23 @@

# java archive paths
JRI_OPT="/opt"
JRI_URL="https://github.com/ev3dev-lang-java/openjdk-ev3/releases/download/v0.5.0/jri10-ev3.tar.gz"
JRI_ZIP="/home/robot/installer/jri10-ev3.tar.gz"
JRI_PATH_ZIP="$JRI_OPT/jri-ev3/"
JRI_PATH_NEW="$JRI_OPT/jri-10-build-050"
JRI_URL="https://ci.adoptopenjdk.net/view/ev3dev/job/openjdk11_build_ev3_linux/40/artifact/build/jri-ev3.tar.gz"
JRI_ZIP="/home/robot/installer/jri-ev3.tar.gz"
JRI_PATH_ZIP="$JRI_OPT/jri"
JRI_PATH_NEW="$JRI_OPT/jri-11"
JRI_EXE="$JRI_PATH_NEW/bin/java"
JRI_PRIORITY="10"
JRI_PRIORITY="11"

# brickpi java repository
JDEB_REPO="deb http://ftp.debian.org/debian buster main contrib non-free"
JDEB_PKG="openjdk-10-jre-headless"
JDEB_TMP_LINK="/usr/lib/jvm/java-10-openjdk-armhf/bin/java"

declare -A JAVA_LATEST
JAVA_LATEST[ev3]="10"
JAVA_LATEST[brickpi]="10"
JAVA_LATEST[brickpi3]="10"
JAVA_LATEST[pistorms]="10"
JDEB_PKG="openjdk-11-jre-headless"
JDEB_TMP_LINK="/usr/lib/jvm/java-11-openjdk-armhf/bin/java"

declare -g -A JAVA_LATEST
JAVA_LATEST[ev3]="11"
JAVA_LATEST[brickpi]="11"
JAVA_LATEST[brickpi3]="11"
JAVA_LATEST[pistorms]="11"

# graphics
CHARACTER="#"
Expand Down