diff --git a/haproxy.sh b/haproxy.sh index f0963e3a..d49cab17 100644 --- a/haproxy.sh +++ b/haproxy.sh @@ -5,7 +5,7 @@ export PATH #================================================= # System Required: CentOS/Debian/Ubuntu # Description: HaProxy -# Version: 1.0.5 +# Version: 1.0.6 # Author: Toyo # Blog: https://doub.io/wlzy-19/ #================================================= @@ -68,8 +68,6 @@ installHaProxy(){ if [[ ${HaProxy_exist} != "" ]]; then echo -e "\033[41;37m [错误] \033[0m 已经安装HaProxy,请检查 !" && exit 1 fi - check_sys -# 系统判断 if [[ ${release} == "centos" ]]; then yum update && yum install -y vim haproxy else @@ -260,8 +258,6 @@ uninstallHaProxy(){ if [[ ! -z $PID ]]; then stopHaProxy fi - check_sys - # 系统判断 if [[ ${release} == "centos" ]]; then yum remove haproxy -y else @@ -278,7 +274,7 @@ uninstallHaProxy(){ echo && echo "卸载已取消..." && echo fi } - +check_sys action=$1 [[ -z $1 ]] && action=install case "$action" in diff --git a/ssr.sh b/ssr.sh index d294c425..4de9aa52 100644 --- a/ssr.sh +++ b/ssr.sh @@ -5,12 +5,12 @@ export PATH #================================================= # System Required: CentOS 6+/Debian 6+/Ubuntu 14.04+ # Description: Install the ShadowsocksR server -# Version: 2.0.27 +# Version: 2.0.28 # Author: Toyo # Blog: https://doub.io/ss-jc42/ #================================================= -sh_ver="2.0.27" +sh_ver="2.0.28" filepath=$(cd "$(dirname "$0")"; pwd) file=$(echo -e "${filepath}"|awk -F "$0" '{print $1}') ssr_folder="/usr/local/shadowsocksr" @@ -1332,12 +1332,12 @@ Other_functions(){ # 封禁 BT PT SPAM BanBTPTSPAM(){ wget -N --no-check-certificate https://raw.githubusercontent.com/ToyoDAdoubi/doubi/master/ban_iptables.sh && chmod +x ban_iptables.sh && bash ban_iptables.sh banall - rm -rf banall.sh + rm -rf ban_iptables.sh } # 解封 BT PT SPAM UnBanBTPTSPAM(){ wget -N --no-check-certificate https://raw.githubusercontent.com/ToyoDAdoubi/doubi/master/ban_iptables.sh && chmod +x ban_iptables.sh && bash ban_iptables.sh unbanall - rm -rf banall.sh + rm -rf ban_iptables.sh } Set_config_connect_verbose_info(){ SSR_installation_status diff --git a/ssrmu.sh b/ssrmu.sh index 50325b63..b59e025b 100644 --- a/ssrmu.sh +++ b/ssrmu.sh @@ -5,12 +5,12 @@ export PATH #================================================= # System Required: CentOS 6+/Debian 6+/Ubuntu 14.04+ # Description: Install the ShadowsocksR mudbjson server -# Version: 1.0.5 +# Version: 1.0.6 # Author: Toyo # Blog: https://doub.io/ss-jc60/ #================================================= -sh_ver="1.0.5" +sh_ver="1.0.6" filepath=$(cd "$(dirname "$0")"; pwd) file=$(echo -e "${filepath}"|awk -F "$0" '{print $1}') ssr_folder="/usr/local/shadowsocksr" @@ -1468,12 +1468,12 @@ Other_functions(){ # 封禁 BT PT SPAM BanBTPTSPAM(){ wget -N --no-check-certificate https://raw.githubusercontent.com/ToyoDAdoubi/doubi/master/ban_iptables.sh && chmod +x ban_iptables.sh && bash ban_iptables.sh banall - rm -rf banall.sh + rm -rf ban_iptables.sh } # 解封 BT PT SPAM UnBanBTPTSPAM(){ wget -N --no-check-certificate https://raw.githubusercontent.com/ToyoDAdoubi/doubi/master/ban_iptables.sh && chmod +x ban_iptables.sh && bash ban_iptables.sh unbanall - rm -rf banall.sh + rm -rf ban_iptables.sh } Set_config_connect_verbose_info(){ SSR_installation_status