Change EV3 Java var prefix from JAVA_ to JRI_

Author: JakubVanek

modules/java.sh

@@ -2,26 +2,26 @@
 
 
 function java_install_bundle() {
-    if [ -d "$JAVA_PATH_NEW" ]; then
+    if [ -d "$JRI_PATH_NEW" ]; then
         echo "Sorry, we detected a previous installation in path: /opt/jri-10-build-050"
         echo
         exit 1
     fi
 
-    if [ ! -f "$JAVA_ZIP" ]; then
+    if [ ! -f "$JRI_ZIP" ]; then
         echo "Downloading new Java..."
-        wget "$JAVA_URL" -O "$JAVA_ZIP"
+        wget "$JRI_URL" -O "$JRI_ZIP"
     else
         echo "Java archive found, using cached."
     fi
 
     # extract it, rename it and point the symlink to it
     echo "Java package acquired, installing..."
-    tar -xf "$JAVA_ZIP" -C "$JAVA_OPT"
-    mv "$JAVA_PATH_ZIP" "$JAVA_PATH_NEW"
-    update-alternatives --install /usr/bin/java java "$JAVA_EXE" 10
+    tar -xf "$JRI_ZIP" -C "$JRI_OPT"
+    mv "$JRI_PATH_ZIP" "$JRI_PATH_NEW"
+    update-alternatives --install /usr/bin/java java "$JRI_EXE" 10
 
-    JAVA_REAL_EXE="$JAVA_EXE"
+    JAVA_REAL_EXE="$JRI_EXE"
 }
 
 function java_install_ppa() {
@@ -61,9 +61,9 @@ if type -p java; then
     echo "Found java executable in PATH"
     JAVA_REAL_EXE="$(which java)"
 
-    if [ ! -d "$JAVA_OPT/jri-10-build-050" ]; then
+    if [ ! -d "$JRI_OPT/jri-10-build-050" ]; then
         echo "But we will upgrade the Java version"
-        echo $JAVA_OPT/jri-10-build-050
+        echo $JRI_OPT/jri-10-build-050
         echo
         if [ "$PLATFORM" == "ev3" ]; then
             java_install_bundle
@@ -74,15 +74,15 @@ if type -p java; then
         fi
     else
       echo "Latest Java installed."
-      echo $JAVA_OPT/jri-10-build-050
+      echo $JRI_OPT/jri-10-build-050
     fi
 
 elif [[ -n "$JAVA_HOME" ]] && [[ -x "$JAVA_HOME/bin/java" ]];  then
     echo "Found java executable in JAVA_HOME"
     JAVA_REAL_EXE="$JAVA_HOME/bin/java"
 
-    echo $JAVA_OPT/jri-10-build-050
-    if [ ! -d "$JAVA_OPT/jri-10-build-050" ]; then
+    echo $JRI_OPT/jri-10-build-050
+    if [ ! -d "$JRI_OPT/jri-10-build-050" ]; then
         echo "But upgrading Java version"
         echo
     fi

modules/vars.sh

@@ -1,13 +1,12 @@
 #!/bin/bash
 
 # java archive paths
-JAVA_OPT="/opt"
-JAVA_URL="https://github.com/ev3dev-lang-java/openjdk-ev3/releases/download/v0.5.0/jri10-ev3.tar.gz"
-JAVA_ZIP="/home/robot/installer/jri10-ev3.tar.gz"
-JAVA_PATH_ZIP="$JAVA_OPT/jri-ev3/"
-JAVA_PATH_NEW="$JAVA_OPT/jri-10-build-050"
-JAVA_EXE="$JAVA_PATH_NEW/bin/java"
-
+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_EXE="$JRI_PATH_NEW/bin/java"
 
 # brickpi java repository
 JDEB_REPO="deb http://ftp.debian.org/debian buster main contrib non-free"
@@ -23,7 +22,6 @@ TOTAL=40
 BT_BRICKPI_PKG="libbluetooth-dev"
 
 # platform detection
-EV3DEV_TESTED="4.4.47-19-ev3dev-ev3"
 BATT_EV3="/sys/class/power_supply/lego-ev3-battery"
 BATT_BRICKPI="/sys/class/power_supply/brickpi-battery"
 BATT_BRICKPI3="/sys/class/power_supply/brickpi3-battery"