refactor(*.sh): 1. ss fix ipv6 bug; 2. trojan use menu

Author: hijkpw

centos_install_ss.sh

@@ -238,12 +238,16 @@ installSS() {
 
     echo "3" > /proc/sys/net/ipv4/tcp_fastopen
     echo "net.ipv4.tcp_fastopen = 3" >> /etc/sysctl.conf
-    
+
+    interface="0.0.0.0"
+    if [[ "$V6_PROXY" != "" ]]; then
+        interface="::"
+    fi
     mkdir -p /etc/shadowsocks-libev
     ssPath=`which ss-server`
     cat > $CONFIG_FILE<<-EOF
 {
-    "server":"::",
+    "server":"$interface",
     "server_port":${PORT},
     "local_port":1080,
     "password":"${PASSWORD}",

ss.sh

@@ -42,7 +42,7 @@ checkSystem() {
         PMT="apt"
         CMD_INSTALL="apt install -y "
         CMD_REMOVE="apt remove -y "
-        CMD_UPGRADE="apt update && apt upgrade -y"
+        CMD_UPGRADE="apt update; apt upgrade -y; apt autoremove -y"
     else
         PMT="yum"
         CMD_INSTALL="yum install -y "
@@ -176,18 +176,18 @@ getData() {
 
 preinstall() {
     $PMT clean all
-    $CMD_UPGRADE
+    echo $CMD_UPGRADE | bash
 
     colorEcho $BULE " 安装必要软件"
     if [[ "$PMT" = "yum" ]]; then
         $CMD_INSTALL epel-release
     fi
     $CMD_INSTALL telnet wget vim net-tools unzip tar qrencode
-    $CMD_INSTALL openssl openssl-devel gettext gcc autoconf libtool automake make asciidoc xmlto
+    $CMD_INSTALL openssl gettext gcc autoconf libtool automake make asciidoc xmlto
     if [[ "$PMT" = "yum" ]]; then
-        $CMD_INSTALL udns-devel libev-devel pcre pcre-devel mbedtls mbedtls-devel libsodium libsodium-devel c-ares c-ares-devel
+        $CMD_INSTALL openssl-devel udns-devel libev-devel pcre pcre-devel mbedtls mbedtls-devel libsodium libsodium-devel c-ares c-ares-devel
     else
-        $CMD_INSTALL libudns-dev libev-dev libpcre3 libpcre3-dev libmbedtls-dev libc-ares2 libc-ares-dev g++
+        $CMD_INSTALL libssl-dev libudns-dev libev-dev libpcre3 libpcre3-dev libmbedtls-dev libc-ares2 libc-ares-dev g++
         $CMD_INSTALL libsodium*
     fi
     res=`which wget`
@@ -255,11 +255,15 @@ installSS() {
     echo "3" > /proc/sys/net/ipv4/tcp_fastopen
     echo "net.ipv4.tcp_fastopen = 3" >> /etc/sysctl.conf
 
+    interface="0.0.0.0"
+    if [[ "$V6_PROXY" != "" ]]; then
+        interface="::"
+    fi
     mkdir -p /etc/shadowsocks-libev
     ssPath=`which ss-server`
     cat > $CONFIG_FILE<<-EOF
 {
-    "server":"::",
+    "server":"$interface",
     "server_port":${PORT},
     "local_port":1080,
     "password":"${PASSWORD}",

ssr.sh

@@ -46,7 +46,7 @@ checkSystem() {
         PMT="apt"
         CMD_INSTALL="apt install -y "
         CMD_REMOVE="apt remove -y "
-        CMD_UPGRADE="apt update && apt upgrade -y"
+        CMD_UPGRADE="apt update && apt upgrade -y; apt autoremove -y"
     else
         PMT="yum"
         CMD_INSTALL="yum install -y "
@@ -270,7 +270,7 @@ getData() {
 preinstall() {
     colorEcho $BLUE " 更新系统..."
     $PMT clean all
-    $CMD_UPGRADE
+    echo $CMD_UPGRADE | bash
     colorEcho $BLUE " 安装必要软件"
     if [[ "$PMT" = "yum" ]]; then
         $CMD_INSTALL epel-release

trojan-go.sh

@@ -60,7 +60,7 @@ checkSystem() {
         PMT="apt"
         CMD_INSTALL="apt install -y "
         CMD_REMOVE="apt remove -y "
-        CMD_UPGRADE="apt update && apt upgrade -y"
+        CMD_UPGRADE="apt update; apt upgrade -y; apt autoremove -y"
     else
         PMT="yum"
         CMD_INSTALL="yum install -y "
@@ -667,7 +667,7 @@ installBBR() {
 
 install() {
     $PMT clean all
-    $CMD_UPGRADE
+    echo $CMD_UPGRADE | bash
     $CMD_INSTALL wget net-tools unzip vim
     res=`which unzip`
     if [[ $? -ne 0 ]]; then
@@ -725,6 +725,7 @@ update() {
 }
 
 uninstall() {
+    echo ""
     read -p " 确定卸载trojan-go？[y/n]：" answer
     if [[ "${answer,,}" = "y" ]]; then
         domain=`grep sni $CONFIG_FILE | cut -d\" -f4`
@@ -737,6 +738,9 @@ uninstall() {
 
         systemctl disable nginx
         $CMD_REMOVE nginx
+        if [[ "$PMT" = "apt" ]]; then
+            $CMD_REMOVE nginx-common
+        fi
         rm -rf /etc/nginx/nginx.conf
         if [[ -f /etc/nginx/nginx.conf.bak ]]; then
             mv /etc/nginx/nginx.conf.bak /etc/nginx/nginx.conf
@@ -766,12 +770,14 @@ run() {
 start() {
     systemctl restart nginx
     systemctl restart trojan-go
-    sleep 3
+    sleep 2
+    statusText
 }
 
 stop() {
     systemctl stop nginx
     systemctl stop trojan-go
+    colorEcho $BLUE " trojan-go停止成功"
 }
 
 
@@ -784,10 +790,10 @@ restart() {
 
     stop
     colorEcho $BLUE " trojan-go停止成功"
-    sleep 3
+    sleep 2
     start
     colorEcho $BLUE " trojan-go启动成功"
-    sleep 3
+    sleep 2
     statusText
 }