From 215c4a72746526a6e0e05dc8fa03bfdb66092560 Mon Sep 17 00:00:00 2001
From: marvzhang <tikazyq@163.com>
Date: Fri, 6 Mar 2020 10:15:46 +0800
Subject: [PATCH] try to fix java install issue

---
 backend/scripts/install.sh | 17 +++++++++++++++++
 docker_init.sh             | 16 +++++-----------
 2 files changed, 22 insertions(+), 11 deletions(-)
 create mode 100644 backend/scripts/install.sh

diff --git a/backend/scripts/install.sh b/backend/scripts/install.sh
new file mode 100644
index 00000000..3579da75
--- /dev/null
+++ b/backend/scripts/install.sh
@@ -0,0 +1,17 @@
+#/bin/bash
+
+# install node.js
+if [ "${CRAWLAB_SERVER_LANG_NODE}" = "Y" ];
+then
+	echo "installing node.js"
+	/bin/sh /app/backend/scripts/install-nodejs.sh
+	echo "installed node.js"
+fi
+
+# install java
+if [ "${CRAWLAB_SERVER_LANG_JAVA}" = "Y" ];
+then
+	echo "installing java"
+	/bin/sh /app/backend/scripts/install-java.sh
+	echo "installed java"
+fi
diff --git a/docker_init.sh b/docker_init.sh
index 19cf8471..dce1137a 100755
--- a/docker_init.sh
+++ b/docker_init.sh
@@ -22,18 +22,12 @@ fi
 # start nginx
 service nginx start
 
-# install languages: Node.js
-if [ "${CRAWLAB_SERVER_LANG_NODE}" = "Y" ];
+# install languages
+if [ "${CRAWLAB_SERVER_LANG_NODE}" = "Y" ] || [ "${CRAWLAB_SERVER_LANG_JAVA}" = "Y" ];
 then
-	echo "installing node.js"
-	/bin/sh /app/backend/scripts/install-nodejs.sh >> /var/log/install-nodejs.sh.log 2>&1 &
-fi
-
-# install languages: Java
-if [ "${CRAWLAB_SERVER_LANG_JAVA}" = "Y" ];
-then
-	echo "installing java"
-	/bin/sh /app/backend/scripts/install-java.sh >> /var/log/install-java.sh.log 2>&1 &
+	echo "installing languages"
+	echo "you can view log at /var/log/install.sh.log"
+	/bin/sh /app/backend/scripts/install.sh >> /var/log/install.sh.log 2>&1 &
 fi
 
 # generate ssh