Merge pull request #1817 from devinbileck/update-install-script

Refine the unix install script
bisq-network · Oct 26, 2018 · 3239b40 · 3239b40
2 parents 5113ccc + eb879ef
commit 3239b40
Showing 1 changed file with 18 additions and 9 deletions.
diff --git a/doc/install_on_unix.sh b/doc/install_on_unix.sh
@@ -1,13 +1,22 @@
 #!/bin/sh
 
-# not tested script based on what @devinbileck posted in https://github.com/bisq-network/bisq/issues/1791
-
-curl -L -O https://download.java.net/java/GA/jdk10/10.0.2/19aef61b38124481863b1413dce1855f/13/openjdk-10.0.2_linux-x64_bin.tar.gz
-sudo mkdir /usr/local/jvm/openjdk-10
-sudo tar -zxf openjdk-10.0.2_linux-x64_bin.tar.gz -C /usr/local/jvm/openjdk-10
-sudo update-alternatives --install "/usr/bin/java" "java" "/usr/local/jvm/openjdk-10/jdk-10.0.2/bin/java" 1500
-sudo update-alternatives --install "/usr/bin/javac" "javac" "/usr/local/jvm/openjdk-10/jdk-10.0.2/bin/javac" 1500
-git clone https://github.com/bisq-network/bisq
+JAVA_HOME=/usr/lib/jvm/openjdk-10.0.2
+
+if [ ! -d "$JAVA_HOME" ]; then
+    apt-get -y install curl
+
+    curl -L -O https://download.java.net/java/GA/jdk10/10.0.2/19aef61b38124481863b1413dce1855f/13/openjdk-10.0.2_linux-x64_bin.tar.gz
+    mkdir -p $JAVA_HOME
+    tar -zxf openjdk-10.0.2_linux-x64_bin.tar.gz -C $JAVA_HOME --strip 1
+    rm openjdk-10.0.2_linux-x64_bin.tar.gz
+
+    update-alternatives --install /usr/bin/java java $JAVA_HOME/bin/java 2000
+    update-alternatives --install /usr/bin/javac javac $JAVA_HOME/bin/javac 2000
+fi
+
+if [ ! -d "bisq" ]; then
+    apt-get -y install git
+    git clone https://github.com/bisq-network/bisq.git
+fi
 cd bisq
 ./gradlew build
-java -jar desktop/build/libs/desktop-0.8.0-SNAPSHOT-all.jar