Merge pull request #28 from ev3dev-lang-java/feature/#26

Feature/#26

Author: jabrena

README.md

@@ -11,14 +11,9 @@ This project tries to save time in this process.
 
 The installer will install the following libraries by default:
 
-+ Java OpenJDK 10 (Java Runtime Image) for EV3 Brick
-+ Java JDK 8 (Only for BrickPi/PiStorms) (It is necessary to upgrade to OpenJDK 10)
++ Java OpenJDK 11 (Java Runtime Image) for all bricks
 
-If you like, you can install a utility to monitor the battery. (Recommended)
-
-+ [BatteryMonitor](https://github.com/ev3dev-lang-java/batteryMonitor) (A Java utility to monitor the Battery)
-
-But it is possible to install the following libraries if your project requires them.
+It is possible to install the following libraries if your project requires them.
 
 + [OpenCV](http://docs.opencv.org/2.4/doc/tutorials/introduction/desktop_java/java_dev_intro.html)
 + [RXTX](https://github.com/rxtx/rxtx) (Serial port library used on [RPLIDAR4J](https://github.com/ev3dev-lang-java/RPLidar4J))

installer.sh

@@ -58,10 +58,6 @@ elif [ "$1" == "copy-installer" ]; then
     CREDENTIAL="$2"
     run_module copy-installer
 
-elif [ "$1" == "batteryMonitor" ]; then
-    run_module java
-    run_module battery-monitor
-
 elif [ "$1" == "extended" ]; then
     run_module java
     run_module native-libraries

modules/battery-monitor.sh

@@ -2,8 +2,7 @@
 
 echo "Installer options:"
 echo "sudo ./installer.sh java [Execute modules: platform, java]"
-echo "sudo ./installer.sh batteryMonitor [Install batteryMonitor]"
-echo "sudo ./installer.sh extended [Execute modules: platform, java, batteryMonitor & native-libraries]"
+echo "sudo ./installer.sh extended [Execute modules: platform, java & native-libraries]"
 echo "sudo ./installer.sh copy-installer robot@192.168.1.206 [Copy the installer to a remote brick]"
 echo
 exit

modules/help.sh

@@ -8,17 +8,10 @@ if [ "$PLATFORM" == "ev3"      ] ||
    [ "$PLATFORM" == "pistorms" ]; then
 
     apt-get update
-    
-    if [ "$(isInstalled libopencv2.4-java)" == "no" ]; then
-        apt-get install --yes --no-install-recommends libopencv2.4-java
-    fi
-    
-    if [ "$(isInstalled librxtx-java)" == "no" ]; then
-        apt-get install --yes --no-install-recommends librxtx-java
-    fi
+    apt-get install --yes --no-install-recommends libopencv2.4-java librxtx-java
 
 else
-    echo "This platform: $PLATFORM is not suitable for Battery Monitor."
+    echo "This platform: $PLATFORM is not suitable for native libraries."
     echo
 fi
 

modules/native-libraries.sh

@@ -37,9 +37,3 @@ BATT_PISTORMS="/sys/class/power_supply/pistorms-battery"
 # installer copy
 INSTALLER_DIR="/home/robot/installer"
 INSTALLER_EXE="/home/robot/installer/installer.sh"
-
-# battery monitor
-BATTMON_URL="https://github.com/ev3dev-lang-java/batteryMonitor/raw/release/v0.2.0-RELEASE/releases/batteryMonitor-0.2.0-RELEASE.zip"
-BATTMON_FILE="/home/robot/batterymonitor.zip"
-BATTMON_ZIPBASE="/home/robot/batteryMonitor-0.2.0-RELEASE"
-BATTMON_BASE="/home/robot/batteryMonitor"