From eff33f1742e0986c4fc4fdcb64d59b233a929e40 Mon Sep 17 00:00:00 2001
From: Teddysun <i@teddysun.com>
Date: Thu, 24 May 2018 20:54:47 +0900
Subject: [PATCH] Update ShadowsocksR version

Signed-off-by: Teddysun <i@teddysun.com>
---
 shadowsocks-all.sh |  4 ++--
 shadowsocksR.sh    | 10 ++++++----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/shadowsocks-all.sh b/shadowsocks-all.sh
index df20116..3680bae 100644
--- a/shadowsocks-all.sh
+++ b/shadowsocks-all.sh
@@ -51,8 +51,8 @@ shadowsocks_python_config="/etc/shadowsocks-python/config.json"
 shadowsocks_python_centos="https://raw.githubusercontent.com/teddysun/shadowsocks_install/master/shadowsocks"
 shadowsocks_python_debian="https://raw.githubusercontent.com/teddysun/shadowsocks_install/master/shadowsocks-debian"
 
-shadowsocks_r_file="shadowsocksr-3.2.1"
-shadowsocks_r_url="https://github.com/shadowsocksrr/shadowsocksr/archive/3.2.1.tar.gz"
+shadowsocks_r_file="shadowsocksr-3.2.2"
+shadowsocks_r_url="https://github.com/shadowsocksrr/shadowsocksr/archive/3.2.2.tar.gz"
 shadowsocks_r_init="/etc/init.d/shadowsocks-r"
 shadowsocks_r_config="/etc/shadowsocks-r/config.json"
 shadowsocks_r_centos="https://raw.githubusercontent.com/teddysun/shadowsocks_install/master/shadowsocksR"
diff --git a/shadowsocksR.sh b/shadowsocksR.sh
index c4ba9a0..1e6b307 100644
--- a/shadowsocksR.sh
+++ b/shadowsocksR.sh
@@ -21,6 +21,8 @@ echo
 
 libsodium_file="libsodium-1.0.16"
 libsodium_url="https://github.com/jedisct1/libsodium/releases/download/1.0.16/libsodium-1.0.16.tar.gz"
+shadowsocks_r_file="shadowsocksr-3.2.2"
+shadowsocks_r_url="https://github.com/shadowsocksrr/shadowsocksr/archive/3.2.2.tar.gz"
 
 #Current folder
 cur_dir=`pwd`
@@ -326,7 +328,7 @@ download_files(){
         exit 1
     fi
     # Download ShadowsocksR file
-    if ! wget --no-check-certificate -O shadowsocksr-3.2.1.tar.gz https://github.com/shadowsocksrr/shadowsocksr/archive/3.2.1.tar.gz; then
+    if ! wget --no-check-certificate -O ${shadowsocks_r_file}.tar.gz ${shadowsocks_r_url}; then
         echo -e "[${red}Error${plain}] Failed to download ShadowsocksR file!"
         exit 1
     fi
@@ -417,8 +419,8 @@ install(){
     ldconfig
     # Install ShadowsocksR
     cd ${cur_dir}
-    tar zxf shadowsocksr-3.2.1.tar.gz
-    mv shadowsocksr-3.2.1/shadowsocks /usr/local/
+    tar zxf ${shadowsocks_r_file}.tar.gz
+    mv ${shadowsocks_r_file}/shadowsocks /usr/local/
     if [ -f /usr/local/shadowsocks/server.py ]; then
         chmod +x /etc/init.d/shadowsocks
         if check_sys packageManager yum; then
@@ -452,7 +454,7 @@ install(){
 # Install cleanup
 install_cleanup(){
     cd ${cur_dir}
-    rm -rf shadowsocksr-3.2.1.tar.gz shadowsocksr-3.2.1 ${libsodium_file}.tar.gz ${libsodium_file}
+    rm -rf ${shadowsocks_r_file}.tar.gz ${shadowsocks_r_file} ${libsodium_file}.tar.gz ${libsodium_file}
 }