fix ss link output

pull/124/head
BOYPT 7 years ago
parent 63e270a9c9
commit 0e5db8023a
  1. 50
      install.sh
  2. 15
      src/ss-info.sh
  3. 15
      tools/v3.sh

@ -509,6 +509,7 @@ shadowsocks_config() {
echo echo
shadowsocks=true shadowsocks=true
shadowsocks_port_config shadowsocks_port_config
ssray_config
break break
elif [[ "$install_shadowsocks" == [Nn] ]]; then elif [[ "$install_shadowsocks" == [Nn] ]]; then
break break
@ -631,13 +632,12 @@ shadowsocks_ciphers_config() {
ssray_config() { ssray_config() {
echo echo
echo echo
echo
echo
echo
echo
while :; do while :; do
echo -e "是否配置 ${yellow}Shadowsocks - V2ray Plugin ${none} [${magenta}Y/N$none]" echo -e "是否配置 ${yellow}Shadowsocks - V2ray Plugin ${none} [${magenta}Y/N$none]"
echo
echo
echo
echo -e "${yellow}注:v2ray-plugin跟刚才配置的v2ray是互相独立的程序,眉有关系。${none}" echo -e "${yellow}注:v2ray-plugin跟刚才配置的v2ray是互相独立的程序,眉有关系。${none}"
read -p "$(echo -e "(默认 [${cyan}N$none]):") " install_ssray read -p "$(echo -e "(默认 [${cyan}N$none]):") " install_ssray
[[ -z "$install_ssray" ]] && install_ssray="n" [[ -z "$install_ssray" ]] && install_ssray="n"
@ -735,9 +735,11 @@ ssray_proto_config() {
echo echo
echo echo
echo "----------------------------------------------------------------" echo "----------------------------------------------------------------"
get_ip
case $ssray_transport in case $ssray_transport in
1) 1)
ssrayopt="server" ssrayopt="server"
ssray_domain=$ip
break break
;; ;;
[2-3]) [2-3])
@ -752,7 +754,6 @@ ssray_proto_config() {
echo "----------------------------------------------------------------" echo "----------------------------------------------------------------"
break break
done done
get_ip
echo echo
echo echo
echo -e "$yellow 请将 $magenta$ssray_domain$none $yellow解析到: $cyan$ip$none" echo -e "$yellow 请将 $magenta$ssray_domain$none $yellow解析到: $cyan$ip$none"
@ -781,25 +782,31 @@ ssray_proto_config() {
esac esac
done done
if [[ -f /root/.acme.sh/$ssray_domain/fullchain.cer ]] && [[ -f /root/.acme.sh/$ssray_domain/$ssray_domain.key ]]; then echo
echo -e "$yellow 噫!好像已经有证书了! 皮皮虾咋们走! $none" echo
else echo
echo -e "$yellow 开始安装acme.sh $none" if [[ $ssray_transport -gt 1 ]]; then
curl https://get.acme.sh | bash if [[ -f /root/.acme.sh/$ssray_domain/fullchain.cer && -f /root/.acme.sh/$ssray_domain/$ssray_domain.key ]]; then
echo -e "$yellow 噫!好像已经有证书了! 皮皮虾咋们走! $none"
else
echo -e "$yellow 开始安装acme.sh $none"
curl https://get.acme.sh | bash
echo -e "$yellow 开始申请 $ssray_domain 的证书,如果有正在使用80端口的程序先让它们退下~... $none" echo -e "$yellow 开始申请 $ssray_domain 的证书,如果有正在使用80端口的程序先让它们退下~... $none"
pkill caddy pkill caddy
pkill httpd pkill httpd
pkill nginx pkill nginx
sleep 3 sleep 3
if /root/.acme.sh/acme.sh --issue --standalone -d $ssray_domain ; then if /root/.acme.sh/acme.sh --issue --standalone -d $ssray_domain ; then
echo -e "$yellow 好了搞定了。$none" echo -e "$yellow 好了搞定了。$none"
else else
echo -e "$yellow 不知道什么鬼,上面的出错提示截图找人问吧!$none" echo -e "$yellow 不知道什么鬼,上面的出错提示截图找人问吧!$none"
exit 1 exit 1
fi
fi fi
fi fi
read -rsp "$(echo -e "$green Enter 回车键 $none继续....或按$red Ctrl + C $none取消.")" -d $'\n'
} }
install_ssray() { install_ssray() {
@ -1187,11 +1194,12 @@ install() {
echo echo
exit 1 exit 1
fi fi
( set -o posix ; set ) >/tmp/variables.before
install_basic install_basic
v2ray_config v2ray_config
blocked_hosts blocked_hosts
shadowsocks_config shadowsocks_config
ssray_config ( set -o posix ; set ) >/tmp/variables.before
install_info install_info
try_enable_bbr try_enable_bbr
# [[ $caddy ]] && domain_check # [[ $caddy ]] && domain_check

@ -1,6 +1,13 @@
[[ -z $ip ]] && get_ip [[ -z $ip ]] && get_ip
if [[ $shadowsocks ]]; then if [[ $shadowsocks ]]; then
local ss="ss://$(echo -n "${ssciphers}:${sspass}@${ip}:${ssport}" | base64 -w 0)#v2ray6.com_ss_${ip}" #local ss="ss://$(echo -n "${ssciphers}:${sspass}@${ip}:${ssport}" | base64 -w 0)#v2ray6.com_ss_${ip}"
local cipherstr=$(echo -n ${ssciphers}:${sspass} | base64 -w 0 | sed 's/=*$//')
local clientopt=$(echo ${ssrayopt} | sed 's/server;\?//')
local opt="?plugin=$(echo "v2ray-plugin;${clientopt}" | sed 's/=/%3d/g; s/;/%3b/g;')"
local ss="ss://${cipherstr}@${ip}:${ssport}#v2ray6.com_ss_${ip}"
local ssplugin="ss://${cipherstr}@${ssray_domain}:${ssrayport}/${opt}#v2ray6.com_ss_${ssray_domain}"
echo echo
echo "---------- Shadowsocks 配置信息 -------------" echo "---------- Shadowsocks 配置信息 -------------"
echo echo
@ -14,8 +21,10 @@ if [[ $shadowsocks ]]; then
echo echo
echo -e "$yellow SS 链接 = ${cyan}$ss$none" echo -e "$yellow SS 链接 = ${cyan}$ss$none"
echo echo
echo -e " 备注:$red Shadowsocks Win 4.0.6 $none客户端可能无法识别该 SS 链接" if [[ $ssray ]]; then
echo echo -e "$yellow SS + V2rayPlugin 链接 = ${cyan}$ssplugin$none"
echo
fi
echo -e "提示: 输入$cyan v2ray ssqr $none可生成 Shadowsocks 二维码链接" echo -e "提示: 输入$cyan v2ray ssqr $none可生成 Shadowsocks 二维码链接"
echo echo
fi fi

@ -74,21 +74,6 @@ sspass=$sspass
#---- Shadowsocks 加密协议 ----- #---- Shadowsocks 加密协议 -----
ssciphers=$ssciphers ssciphers=$ssciphers
#---- Shadowsocks V2ray -----
ssray=$ssray_status
#---- Shadowsocks V2ray-plugin 端口 -----
ssrayport=$ssrayport
#---- Shadowsocks V2ray-plugin 参数 -----
ssrayopt=$ssrayopt
#---- Shadowsocks V2ray-plugin 用户选择的 -----
ssray_transport=$ssray_transport
#---- Shadowsocks V2ray-plugin 版本-----
ssray_ver=$ssray_ver
#---- 屏蔽广告 ----- #---- 屏蔽广告 -----
ban_ad=$blocked_ad_status ban_ad=$blocked_ad_status

Loading…
Cancel
Save