From 0521b9c0cc16bd7d7f3f9ebe0d3f7e729ef68e70 Mon Sep 17 00:00:00 2001
From: Zhang Peng <forbreak@163.com>
Date: Thu, 1 Feb 2018 17:36:03 +0800
Subject: [PATCH] =?UTF-8?q?:sparkles:=20=E6=9B=B4=E6=96=B0=E7=8E=AF?=
 =?UTF-8?q?=E5=A2=83=E9=83=A8=E7=BD=B2=E8=84=9A=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 codes/deploy/lib/install-libs.sh      | 13 +++++++++++++
 codes/deploy/main.sh                  |  4 ++++
 codes/deploy/tool/jdk/install-jdk8.sh | 22 +++++-----------------
 3 files changed, 22 insertions(+), 17 deletions(-)
 create mode 100644 codes/deploy/lib/install-libs.sh

diff --git a/codes/deploy/lib/install-libs.sh b/codes/deploy/lib/install-libs.sh
new file mode 100644
index 0000000..578a751
--- /dev/null
+++ b/codes/deploy/lib/install-libs.sh
@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+
+echo -e "\n>>>>>>>>> install gcc gcc-c++ kernel-devel libtool"
+yum -y install make gcc gcc-c++ kernel-devel libtool
+
+echo -e "\n>>>>>>>>> install openssl openssl-devel"
+yum -y install make openssl openssl-devel
+
+echo -e "\n>>>>>>>>> install zlib zlib-devel"
+yum -y install make zlib zlib-devel
+
+echo -e "\n>>>>>>>>> install pcre"
+yum -y install pcre
diff --git a/codes/deploy/main.sh b/codes/deploy/main.sh
index ec29925..e968e09 100644
--- a/codes/deploy/main.sh
+++ b/codes/deploy/main.sh
@@ -44,6 +44,8 @@ cat << EOF
 
 ====================================== Deploy Menu ======================================
 【1 - System Environment】
+    [1-2 | libs] install commonly libs.
+
 【2 - Common Tools】
     [2 | tools] install all tools.
     [2-1 | git] install git.                 [2-2 | jdk8] install jdk8.
@@ -61,6 +63,8 @@ function chooseOper() {
   while read key
   do
     case ${key} in
+      1-2 | libs) ${filepath}/lib/install-libs.sh;;
+
       2 | tools) ${filepath}/tool/install-all.sh;;
       2-1 | git) ${filepath}/tool/git/install-git.sh;;
       2-2 | jdk8) ${filepath}/tool/jdk/install-jdk8.sh;;
diff --git a/codes/deploy/tool/jdk/install-jdk8.sh b/codes/deploy/tool/jdk/install-jdk8.sh
index 7622889..5319baf 100644
--- a/codes/deploy/tool/jdk/install-jdk8.sh
+++ b/codes/deploy/tool/jdk/install-jdk8.sh
@@ -1,25 +1,13 @@
 #!/bin/bash
 
-echo -e "\n>>>>>>>>> install jdk8"
+yum -y install java-1.8.0-openjdk-devel-debug.x86_64
 
-wget http://download.oracle.com/otn-pub/java/jdk/7u79-b15/jdk-7u79-linux-x64.rpm?AuthParam=1471671456_14c9442ffc64438c1b8fc83587ecdf47
-path = './jdk-7u79-linux-x64.rpm'
-
-echo '正在安装JDK...'
-#update java
-for installedJava in $(rpm -qa |grep java);do
-rpm -e --nodeps $installedJava
-done
-rpm -ivh $path
-sunJava=$(ls /usr/java |grep jdk)
-if [ "$sunJava" != "" ];then
-cat >/etc/profile.d/java.sh<<EOF
-JAVA_HOME=/usr/java/$sunJava
-PATH=$JAVA_HOME/bin:\$PATH
+cat >/etc/profile.d/jdk.sh<<EOF
+JAVA_HOME=/usr/lib/jvm/java
+PATH=${JAVA_HOME}/bin:\$PATH
 CLASSPATH=.:\$JAVA_HOME/lib/dt.jar:\$JAVA_HOME/lib/tools.jar
 export JAVA_HOME
 export PATH
 export CLASSPATH
 EOF
-chown root.root /etc/profile.d/java.sh
-fi
+chown root.root /etc/profile.d/jdk.sh