Merge develop back into master (PR #29)

Author: JakubVanek

README.md

@@ -11,13 +11,9 @@ This project tries to save time in this process.
 
 The installer will install the following libraries by default:
 
-+ Java JDK 8 (Only for BrickPi/PiStorms)
++ 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))
@@ -38,21 +34,6 @@ sudo apt-get dist-upgrade
 sudo reboot
 ```
 
-### EV3 Brick and Java
-
-If you are using a EV3Brick, you will have to install Java JRE8 Manually.
-Download the file: `ejdk-8-fcs-b132-linux-arm-sflt-03_mar_2014.tar.gz` from:
-http://www.oracle.com/technetwork/java/embedded/downloads/javase/javaseemeddedev3-1982511.html
-and copy the file to the following route: `/home/robot/`
-
-**Example:**
-
-```
-scp "/home/robot/ejdk-8-fcs-b132-linux-arm-sflt-03_mar_2014.tar.gz" "[email protected]:/home/robot"
-```
-
-Later, the Installer will manage the file in Java module.
-
 ### Running the installer
 
 ```
@@ -64,8 +45,3 @@ chmod +x installer.sh
 sudo ./installer.sh help
 sudo ./installer.sh
 ```
-
-## Advanced
-
-It is nice to configure one brick but maybe you could discover that the installer could move the JDK one manual process to another brick and hte installer it is possible to replicate to another remote brick. Play with the help to discover the way.
-

installer.sh

@@ -1,70 +1,69 @@
 #!/bin/bash
 # A Bash script to install Linux Libraries used on EV3Dev-lang-java.
 # Author: Juan Antonio Breña Moral, [email protected]
+# Author: Jakub Vaněk, [email protected]
 
-echo
-echo "##############################"
-echo "# EV3Dev-lang-java Installer #"
-echo "##############################"
-echo "# Last update: 2017/06/18    #"
-echo "##############################"
-echo
+MODULE="unknown"
+MODULE_FOLDER="/home/robot/installer/module"
+ROOT_URL="https://raw.githubusercontent.com/ev3dev-lang-java/installer/develop/modules"
+
+# $1 => module name
+function download_module() {
+    pushd "$MODULE_FOLDER" >/dev/null
+    wget -qN "$ROOT_URL/$1.sh"
+    popd  >/dev/null
+}
+
+# $1 => module name
+function run_module() {
+    MODULE="$1"
+    createHeader "$1"
+    download_module "$1"
+    source "$MODULE_FOLDER/$1.sh"
+}
 
-OFF=0
-MODULE="EMPTY"
-MODULE_FOLDER="module2"
-function runModule(){
-    if ! [ "$2" == "$OFF" ]; then
-        createHeader $1
-    fi
-    local domain="https://raw.githubusercontent.com/ev3dev-lang-java/installer/develop/modules"
-    wget -N "$domain/$1.sh"
-    MODULE=$1
-    mv ./$1.sh ./$MODULE_FOLDER/$1.sh
+# $1 => module name
+function inc_module() {
+    download_module "$1"
     source "$MODULE_FOLDER/$1.sh"
 }
 
-function initInstaller(){
+function init_installer() {
     echo "Init installer"
-    mkdir -p $MODULE_FOLDER
-    rm ./$MODULE_FOLDER/*
+    #rm -rf "$MODULE_FOLDER"
+    mkdir -p "$MODULE_FOLDER"
 }
 
-MODE_HELP="help"
-MODE_JDK="jdk"
-MODE_BATTERY_MONITOR="batteryMonitor"
-MODE_COPY_INSTALLER="copy-installer"
-MODE_EXTENDED="extended"
+echo
+echo "##############################"
+echo "# EV3Dev-lang-java Installer #"
+echo "##############################"
+echo "# Last update: 2018/11/10    #"
+echo "##############################"
+echo
+
 
 #Init
-initInstaller
-runModule utilities 0
+init_installer
+inc_module vars
+inc_module utilities
 
-if [ "$1" == "$MODE_HELP" ]; then
-    runModule help
-fi
+run_module platform
 
-#TODO Disable this option if platform is not EV3BRICK
-CREDENTIAL=""
-if [ "$1" == "$MODE_JDK" ]; then
-    CREDENTIAL=$2
-    runModule copy-jdk
-fi
 
-if [ "$1" == "$MODE_COPY_INSTALLER" ]; then
-    CREDENTIAL=$2
-    runModule copy-installer
-fi
+if [ "$1" == "help" ]; then
+    run_module help
 
-runModule platform
-runModule java
+elif [ "$1" == "copy-installer" ]; then
+    CREDENTIAL="$2"
+    run_module copy-installer
 
-if [ "$1" == "$MODE_BATTERY_MONITOR" ]; then
-    runModule battery-monitor
-fi
+elif [ "$1" == "extended" ]; then
+    run_module java
+    run_module native-libraries
 
-if [ "$1" == "$MODE_EXTENDED" ]; then
-    runModule native-libraries
+elif [ "$1" == "java" ]; then
+    run_module java
 fi
 
-exit 0
+exit 0

modules/battery-monitor.sh

@@ -1,16 +1,16 @@
 #!/bin/bash
 
-if [ -e "/home/robot/installer/installer.sh" ]; then
-    echo $CREDENTIAL
-    ssh $CREDENTIAL 'uptime'
-    ssh $CREDENTIAL 'sudo mkdir /home/robot/installer/'
-    scp "/home/robot/installer/installer.sh" "$CREDENTIAL:/home/robot/installer"
-    ssh $CREDENTIAL 'sudo chmod +x /home/robot/installer.sh'
+if [ -e "$INSTALLER_EXE" ]; then
+    chmod +x "$INSTALLER_EXE"
+
+    echo "SSHing to: $CREDENTIAL"
+    ssh "$CREDENTIAL" "uptime; sudo mkdir -p $INSTALLER_DIR"
+    scp "$INSTALLER_EXE" "$CREDENTIAL:$INSTALLER_DIR"
     exit
 else
     echo "Sorry, the installer didn´t detect the installer"
     echo "on /home/robot/installer"
     echo "try to review your installation on your EV3 Brick."
     echo
     exit 1
-fi
+fi

modules/copy-installer.sh

@@ -7,14 +7,14 @@ echo "##############################"
 echo ""
 
 #2. Install Bluetooth
-if [ "$PLATFORM" == "$EV3" ];
+if [ "$PLATFORM" == "ev3" ];
 then
-    echo $EV3
+    echo "EV3"
     #isInstalled libbluetooth-dev
     #wget http://ftp.us.debian.org/debian/pool/main/b/bluez/libbluetooth-dev_5.23-2+b1_armel.deb
     #dpkg --force-depends-version -i libbluetooth-dev_5.23-2+b1_armel.deb
 else
-    echo $BRICKPI
-    isInstalled libbluetooth-dev
+    echo "BrickPi"
+    isInstalled "$BT_BRICKPI_PKG"
     #apt-get install libbluetooth-dev
-fi
+fi

modules/copy-jdk.sh

@@ -1,10 +1,8 @@
 #!/bin/bash
 
 echo "Installer options:"
-echo "sudo ./installer.sh [Execute modules: platform, java & batteryMonitor]"
-echo "sudo ./installer.sh batteryMonitor [Install batteryMonitor]"
-echo "sudo ./installer.sh extended [Execute modules: platform, java, batteryMonitor & native-libraries]"
-echo "sudo ./installer.sh jdk [email protected] [Copy your local JRE to a remote brick]"
+echo "sudo ./installer.sh java [Execute modules: platform, java]"
+echo "sudo ./installer.sh extended [Execute modules: platform, java & native-libraries]"
 echo "sudo ./installer.sh copy-installer [email protected] [Copy the installer to a remote brick]"
 echo
-exit
+exit