From a72a40b6124332e26016d1e155260db065ce6c77 Mon Sep 17 00:00:00 2001
From: Zhang Peng <forbreak@163.com>
Date: Tue, 7 May 2019 11:08:13 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=84=9A=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 codes/linux/ops/service/README.md             | 33 +++++++++++++++++++
 codes/linux/ops/service/jdk/README.md         | 10 ------
 .../{jdk/install-jdk8.sh => jdk8-install.sh}  |  2 ++
 .../install-redis.sh => redis-install.sh}     | 30 ++++++++++-------
 codes/linux/ops/service/redis/README.md       |  9 -----
 5 files changed, 54 insertions(+), 30 deletions(-)
 create mode 100644 codes/linux/ops/service/README.md
 delete mode 100644 codes/linux/ops/service/jdk/README.md
 rename codes/linux/ops/service/{jdk/install-jdk8.sh => jdk8-install.sh} (96%)
 rename codes/linux/ops/service/{redis/install-redis.sh => redis-install.sh} (53%)
 delete mode 100644 codes/linux/ops/service/redis/README.md

diff --git a/codes/linux/ops/service/README.md b/codes/linux/ops/service/README.md
new file mode 100644
index 0000000..921bc34
--- /dev/null
+++ b/codes/linux/ops/service/README.md
@@ -0,0 +1,33 @@
+# 服务安装配置
+
+## JDK 安装
+
+说明：
+
+JDK8 会被安装到 `/usr/lib/jvm/java` 路径。
+
+使用方法：
+
+执行以下任意命令即可执行安装脚本。
+
+```sh
+curl -o- https://raw.githubusercontent.com/dunwu/os-tutorial/master/codes/linux/ops/service/jdk8-install.sh | bash
+wget -qO- https://raw.githubusercontent.com/dunwu/os-tutorial/master/codes/linux/ops/service/jdk8-install.sh | bash
+```
+
+## Redis 安装
+
+说明：
+
+下载 `5.0.4` 版本的 redis 并解压安装到 `/opt/redis` 路径下。
+
+使用方法：
+
+执行以下任意命令即可执行安装脚本。
+
+```sh
+curl -o- https://raw.githubusercontent.com/dunwu/os-tutorial/master/codes/linux/ops/service/redis-install.sh | bash
+wget -qO- https://raw.githubusercontent.com/dunwu/os-tutorial/master/codes/linux/ops/service/redis-install.sh | bash
+```
+
+
diff --git a/codes/linux/ops/service/jdk/README.md b/codes/linux/ops/service/jdk/README.md
deleted file mode 100644
index ea0b100..0000000
--- a/codes/linux/ops/service/jdk/README.md
+++ /dev/null
@@ -1,10 +0,0 @@
-# 脚本使用说明
-
-## 安装 JDK
-
-使用方法：执行以下任意命令即可执行脚本。
-
-```sh
-curl -o- https://raw.githubusercontent.com/dunwu/os-tutorial/master/codes/linux/ops/service/jdk/install-jdk8.sh | bash
-wget -qO- https://raw.githubusercontent.com/dunwu/os-tutorial/master/codes/linux/ops/service/jdk/install-jdk8.sh | bash
-```
diff --git a/codes/linux/ops/service/jdk/install-jdk8.sh b/codes/linux/ops/service/jdk8-install.sh
similarity index 96%
rename from codes/linux/ops/service/jdk/install-jdk8.sh
rename to codes/linux/ops/service/jdk8-install.sh
index 6d31fc6..d59ed64 100644
--- a/codes/linux/ops/service/jdk/install-jdk8.sh
+++ b/codes/linux/ops/service/jdk8-install.sh
@@ -1,11 +1,13 @@
 #!/usr/bin/env bash
 
+cat << EOF
 ###################################################################################
 # 安装 JDK8 脚本
 # 仅适用于所有 CentOS 发行版本
 # JDK 会被安装到 /usr/lib/jvm/java 路径。
 # Author: Zhang Peng
 ###################################################################################
+EOF
 
 echo -e "\n>>>>>>>>> install jdk8"
 
diff --git a/codes/linux/ops/service/redis/install-redis.sh b/codes/linux/ops/service/redis-install.sh
similarity index 53%
rename from codes/linux/ops/service/redis/install-redis.sh
rename to codes/linux/ops/service/redis-install.sh
index e948bac..4b29212 100644
--- a/codes/linux/ops/service/redis/install-redis.sh
+++ b/codes/linux/ops/service/redis-install.sh
@@ -1,23 +1,31 @@
 #!/usr/bin/env bash
 
+cat << EOF
 ###################################################################################
 # 安装 Redis 脚本
-# 适用于所有 linux 发行版本。
-# 注意：安装 nginx 需要依赖以下库，需预先安装：
-# yum install -y zlib zlib-devel gcc-c++ libtool openssl openssl-devel tcl
 # Author: Zhang Peng
 ###################################################################################
+EOF
 
-echo -e "\n>>>>>>>>> install redis"
+version=5.0.4
+if [[ -n $1 ]]; then
+  version=$1
+fi
 
-# 下载并解压 redis
 root=/opt/redis
-version=4.0.8
+if [[ -n $2 ]]; then
+  root=$2
+fi
+
+echo -e "\n>>>>>>>>> install libs"
+yum install -y zlib zlib-devel gcc-c++ libtool openssl openssl-devel tcl
+
+echo -e "\n>>>>>>>>> download redis"
 mkdir -p ${root}
 wget -O ${root}/redis-${version}.tar.gz http://download.redis.io/releases/redis-${version}.tar.gz
-cd ${root}systemctl
-tar zxvf redis-${version}.tar.gz
 
-# 编译
-cd redis-${version}
-make
+echo -e "\n>>>>>>>>> install redis"
+tar zxvf ${root}/redis-${version}.tar.gz -C ${root}
+cd ${root}/redis-${version}
+make & make install
+cd -
diff --git a/codes/linux/ops/service/redis/README.md b/codes/linux/ops/service/redis/README.md
deleted file mode 100644
index 39e2be8..0000000
--- a/codes/linux/ops/service/redis/README.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# 安装 Redis
-
-使用方法：
-
-```sh
-curl -o- https://raw.githubusercontent.com/dunwu/os-tutorial/master/codes/linux/ops/service/redis/install-redis.sh | bash
-```
-
-脚本会下载解压 redis 到 `/opt/redis` 路径下。