Skip to content

Commit

Permalink
v4.34.8
Browse files Browse the repository at this point in the history
  • Loading branch information
cary-sas committed Apr 15, 2021
1 parent 9baa00e commit 1aa41ae
Show file tree
Hide file tree
Showing 17 changed files with 12,816 additions and 12,637 deletions.
5 changes: 3 additions & 2 deletions 380_armv5/readme.txt
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
文件仅用upx压缩，此库供v2ray二进制更新使用，仅支持380固件，armv5，其他固件请自行使用upx压缩即可
压缩命令：upx --lzma --ultra-brute v2ray v2ctl
备用命令: upx -9 v2ray v2ctl
压缩命令：upx --lzma --ultra-brute v2ray
备用命令: upx -9 v2ray
ubuntu : apt install upx-ucl && upx-ucl --best v2ray
1 change: 1 addition & 0 deletions 380_armv5_packge/4.34.8/md5sum.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
99c8ed8a8633bab0b85484d8848419c2
Binary file added 380_armv5_packge/4.34.8/shadowsocks.tar.gz
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion 380_armv5_packge/latest.txt
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4.34.7
4.34.8
Binary file modified shadowsocks/bin/jq
View file
Binary file not shown.
Binary file removed shadowsocks/bin/v2ctl
View file
Binary file not shown.
4 changes: 2 additions & 2 deletions shadowsocks/install.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -237,8 +237,8 @@ dbus set softcenter_module_shadowsocks_description="科学上网 for merlin armv
dbus set softcenter_module_shadowsocks_home_url="Main_Ss_Content.asp"

# 设置v2ray 版本号
dbus set ss_basic_v2ray_version=4.34.7
dbus set ss_basic_v2ray_date=20210413
dbus set ss_basic_v2ray_version=4.34.8
dbus set ss_basic_v2ray_date=20210415

echo_date 一点点清理工作...
rm -rf /tmp/shadowsocks* >/dev/null 2>&1
Expand Down
43 changes: 22 additions & 21 deletions shadowsocks/scripts/ss_online_update.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -159,9 +159,9 @@ prepare(){
[ -n "$(dbus get ssconf_basic_v2ray_mux_enable_$nu)" ] && echo dbus set ssconf_basic_v2ray_mux_enable_$q=$(dbus get ssconf_basic_v2ray_mux_enable_$nu) >> /tmp/ss_conf.sh
[ -n "$(dbus get ssconf_basic_v2ray_mux_concurrency_$nu)" ] && echo dbus set ssconf_basic_v2ray_mux_concurrency_$q=$(dbus get ssconf_basic_v2ray_mux_concurrency_$nu) >> /tmp/ss_conf.sh
[ -n "$(dbus get ssconf_basic_v2ray_json_$nu)" ] && echo dbus set ssconf_basic_v2ray_json_$q=$(dbus get ssconf_basic_v2ray_json_$nu) >> /tmp/ss_conf.sh
[ -n "$(dbus get ssconf_basic_trojan_binary_$nu)" ] && dbus set ssconf_basic_trojan_binary_$q=$(ssconf_basic_trojan_binary_$nu) >> /tmp/ss_conf.sh
[ -n "$(dbus get ssconf_basic_trojan_network_$nu)" ] && dbus set ssconf_basic_trojan_network_$q=$(ssconf_basic_trojan_network_$nu) >> /tmp/ss_conf.sh
[ -n "$(dbus get ssconf_basic_trojan_sni_$nu)" ] && dbus set ssconf_basic_trojan_sni_$q=$(ssconf_basic_trojan_sni_$nu) >> /tmp/ss_conf.sh
[ -n "$(dbus get ssconf_basic_trojan_binary_$nu)" ] && echo dbus set ssconf_basic_trojan_binary_$q=$(dbus get ssconf_basic_trojan_binary_$nu) >> /tmp/ss_conf.sh
[ -n "$(dbus get ssconf_basic_trojan_network_$nu)" ] && echo dbus set ssconf_basic_trojan_network_$q=$(dbus get ssconf_basic_trojan_network_$nu) >> /tmp/ss_conf.sh
[ -n "$(dbus get ssconf_basic_trojan_sni_$nu)" ] && echo dbus set ssconf_basic_trojan_sni_$q=$(dbus get ssconf_basic_trojan_sni_$nu) >> /tmp/ss_conf.sh
[ -n "$(dbus get ssconf_basic_type_$nu)" ] && echo dbus set ssconf_basic_type_$q=$(dbus get ssconf_basic_type_$nu) >> /tmp/ss_conf.sh
[ -n "$(dbus get ssconf_basic_v2ray_protocol_$nu)" ] && echo dbus set ssconf_basic_v2ray_protocol_$q=$(dbus get ssconf_basic_v2ray_protocol_$nu) >> /tmp/ss_conf.sh
[ -n "$(dbus get ssconf_basic_v2ray_xray_$nu)" ] && echo dbus set ssconf_basic_v2ray_xray_$q=$(dbus get ssconf_basic_v2ray_xray_$nu) >> /tmp/ss_conf.sh
Expand Down Expand Up @@ -548,34 +548,34 @@ get_vmess_config(){
fi
#decode_link="$1"
v2ray_group="$2"
v2ray_v=$(echo "$decode_link" | jq -r .v)
v2ray_ps=$(echo "$decode_link" | jq -r .ps | sed 's/[ \t]*//g')
v2ray_add=$(echo "$decode_link" | jq -r .add | sed 's/[ \t]*//g')
v2ray_port=$(echo "$decode_link" | jq -r .port | sed 's/[ \t]*//g')
v2ray_id=$(echo "$decode_link" | jq -r .id | sed 's/[ \t]*//g')
v2ray_aid=$(echo "$decode_link" | jq -r .aid | sed 's/[ \t]*//g')
v2ray_net=$(echo "$decode_link" | jq -r .net)
v2ray_type=$(echo "$decode_link" | jq -r .type)
v2ray_tls_tmp=$(echo "$decode_link" | jq -r .tls)
v2ray_v=$(echo "$decode_link" | sed -E 's/.*"v":"?([^,"]*)"?.*/\1/')
v2ray_ps=$(echo "$decode_link" | sed -E 's/.*"ps":"?([^,"]*)"?.*/\1/')
v2ray_add=$(echo "$decode_link" | sed 's/[ \t]*//g' | sed -E 's/.*"add":"?([^,"]*)"?.*/\1/')
v2ray_port=$(echo "$decode_link" | sed -E 's/.*"port":"?([^,"]*)"?.*/\1/')
v2ray_id=$(echo "$decode_link" | sed -E 's/.*"id":"?([^,"]*)"?.*/\1/')
v2ray_aid=$(echo "$decode_link" | sed -E 's/.*"aid":"?([^,"]*)"?.*/\1/')
v2ray_net=$(echo "$decode_link" | sed -E 's/.*"net":"?([^,"]*)"?.*/\1/')
v2ray_type=$(echo "$decode_link" | sed -E 's/.*"type":"?([^,"]*)"?.*/\1/')
v2ray_tls_tmp=$(echo "$decode_link" | sed -E 's/.*"tls":"?([^,"]*)"?.*/\1/')
[ "$v2ray_tls_tmp"x == "tls"x ] && v2ray_tls="tls" || v2ray_tls="none"

if [ "$v2ray_v" == "2" ];then
#echo_date "new format"
v2ray_path=$(echo "$decode_link" |jq -r .path)
v2ray_host=$(echo "$decode_link" |jq -r .host)
v2ray_path=$(echo "$decode_link" | sed -E 's/.*"path":"?([^,"]*)"?.*/\1/')
v2ray_host=$(echo "$decode_link" | sed -E 's/.*"host":"?([^,"]*)"?.*/\1/')
else
#echo_date "old format"
case $v2ray_net in
tcp)
v2ray_host=$(echo "$decode_link" |jq -r .host)
v2ray_host=$(echo "$decode_link" | sed -E 's/.*"host":"?([^,"]*)"?.*/\1/')
v2ray_path=""
;;
kcp)
v2ray_host=""
v2ray_path=$(echo "$decode_link" | jq -r .path)
v2ray_path=$(echo "$decode_link" | sed -E 's/.*"path":"?([^,"]*)"?.*/\1/')
;;
ws)
v2ray_host_tmp=$(echo "$decode_link" |jq -r .host)
v2ray_host_tmp=$(echo "$decode_link" | sed -E 's/.*"host":"?([^,"]*)"?.*/\1/')
if [ -n "$v2ray_host_tmp" ];then
format_ws=`echo $v2ray_host_tmp|grep -E ";"`
if [ -n "$format_ws" ];then
Expand All @@ -589,7 +589,7 @@ get_vmess_config(){
;;
h2)
v2ray_host=""
v2ray_path=$(echo "$decode_link" |jq -r .path)
v2ray_path=$(echo "$decode_link" | sed -E 's/.*"path":"?([^,"]*)"?.*/\1/')
;;
esac
fi
Expand Down Expand Up @@ -1318,9 +1318,9 @@ remove_node_gap(){
[ -n "$(dbus get ssconf_basic_v2ray_mux_enable_$nu)" ] && dbus set ssconf_basic_v2ray_mux_enable_"$y"="$(dbus get ssconf_basic_v2ray_mux_enable_$nu)" && dbus remove ssconf_basic_v2ray_mux_enable_$nu
[ -n "$(dbus get ssconf_basic_v2ray_mux_concurrency_$nu)" ] && dbus set ssconf_basic_v2ray_mux_concurrency_"$y"="$(dbus get ssconf_basic_v2ray_mux_concurrency_$nu)" && dbus remove ssconf_basic_v2ray_mux_concurrency_$nu
[ -n "$(dbus get ssconf_basic_v2ray_json_$nu)" ] && dbus set ssconf_basic_v2ray_json_"$y"="$(dbus get ssconf_basic_v2ray_json_$nu)" && dbus remove ssconf_basic_v2ray_json_$nu
[ -n "$(dbus get ssconf_basic_trojan_binary_$nu)" ] && dbus set ssconf_basic_trojan_binary_"$y"="$(ssconf_basic_trojan_binary_$nu)" && dbus remove ssconf_basic_trojan_binary_$nu
[ -n "$(dbus get ssconf_basic_trojan_network_$nu)" ] && dbus set ssconf_basic_trojan_network_"$y"="$(ssconf_basic_trojan_network_$nu)" && dbus remove ssconf_basic_trojan_network_$nu
[ -n "$(dbus get ssconf_basic_trojan_sni_$nu)" ] && dbus set ssconf_basic_trojan_sni_"$y"="$(ssconf_basic_trojan_sni_$nu)" && dbus remove ssconf_basic_trojan_sni_$nu
[ -n "$(dbus get ssconf_basic_trojan_binary_$nu)" ] && dbus set ssconf_basic_trojan_binary_"$y"="$(dbus get ssconf_basic_trojan_binary_$nu)" && dbus remove ssconf_basic_trojan_binary_$nu
[ -n "$(dbus get ssconf_basic_trojan_network_$nu)" ] && dbus set ssconf_basic_trojan_network_"$y"="$(dbus get ssconf_basic_trojan_network_$nu)" && dbus remove ssconf_basic_trojan_network_$nu
[ -n "$(dbus get ssconf_basic_trojan_sni_$nu)" ] && dbus set ssconf_basic_trojan_sni_"$y"="$(dbus get ssconf_basic_trojan_sni_$nu)" && dbus remove ssconf_basic_trojan_sni_$nu
[ -n "$(dbus get ssconf_basic_type_$nu)" ] && dbus set ssconf_basic_type_"$y"="$(dbus get ssconf_basic_type_$nu)" && dbus remove ssconf_basic_type_$nu
[ -n "$(dbus get ssconf_basic_v2ray_protocol_$nu)" ] && dbus set ssconf_basic_v2ray_protocol_"$y"="$(dbus get ssconf_basic_v2ray_protocol_$nu)" && dbus remove ssconf_basic_v2ray_protocol_$nu
[ -n "$(dbus get ssconf_basic_v2ray_xray_$nu)" ] && dbus set ssconf_basic_v2ray_xray_"$y"="$(dbus get ssconf_basic_v2ray_xray_$nu)" && dbus remove ssconf_basic_v2ray_xray_$nu
Expand Down Expand Up @@ -1826,6 +1826,7 @@ case $ss_online_action in
set_lock
detect
remove_online
remove_node_gap
unset_lock
;;
2)
Expand Down
1 change: 0 additions & 1 deletion shadowsocks/scripts/ss_pack.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ cp /koolshare/bin/jq $TARGET_FOLDER/bin/
cp /koolshare/bin/speeder* $TARGET_FOLDER/bin/
cp /koolshare/bin/udp2raw $TARGET_FOLDER/bin/
cp /koolshare/bin/v2ray $TARGET_FOLDER/bin/
cp /koolshare/bin/v2ctl $TARGET_FOLDER/bin/
cp /koolshare/bin/xray $TARGET_FOLDER/bin/
cp /koolshare/bin/trojan-go $TARGET_FOLDER/bin/
cp /koolshare/bin/haveged $TARGET_FOLDER/bin/
Expand Down
20 changes: 3 additions & 17 deletions shadowsocks/scripts/ss_v2ray.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ get_latest_version(){
fi
V2VERSION=`cat /tmp/v2ray_latest_info.txt | sed 's/v//g'` || 0
echo_date "检测到V2Ray最新版本：v$V2VERSION"
if [ ! -f "/koolshare/bin/v2ray" -o ! -f "/koolshare/bin/v2ctl" ];then
if [ ! -f "/koolshare/bin/v2ray" ];then
echo_date "v2ray安装文件丢失！重新下载！"
CUR_VER="0"
else
Expand Down Expand Up @@ -139,18 +139,7 @@ update_now(){
echo_date "v2ray程序下载成功..."
fi

echo_date "开始下载v2ctl程序"
#wget --no-check-certificate --timeout=20 --tries=1 $url_main/$1/v2ctl
curlxx -o /tmp/v2ray/v2ctl $url_main/$1/v2ctl
if [ "$?" != "0" ];then
echo_date "v2ctl下载失败！"
v2ctl_ok=0
else
v2ctl_ok=1
echo_date "v2ctl程序下载成功..."
fi

if [ "$md5sum_ok=1" ] && [ "$v2ray_ok=1" ] && [ "$v2ctl_ok=1" ];then
if [ "$md5sum_ok=1" ] && [ "$v2ray_ok=1" ];then
check_md5sum
else
echo_date "使用备用服务器下载..."
Expand Down Expand Up @@ -214,9 +203,7 @@ check_md5sum(){
echo_date "校验下载的文件!"
V2RAY_LOCAL_MD5=`md5sum v2ray|awk '{print $1}'`
V2RAY_ONLINE_MD5=`cat md5sum.txt|grep -w v2ray|awk '{print $1}'`
V2CTL_LOCAL_MD5=`md5sum v2ctl|awk '{print $1}'`
V2CTL_ONLINE_MD5=`cat md5sum.txt|grep v2ctl|awk '{print $1}'`
if [ "$V2RAY_LOCAL_MD5"x = "$V2RAY_ONLINE_MD5"x ] && [ "$V2CTL_LOCAL_MD5"x = "$V2CTL_ONLINE_MD5"x ];then
if [ "$V2RAY_LOCAL_MD5"x = "$V2RAY_ONLINE_MD5"x ];then
echo_date "文件校验通过!"
install_binary
else
Expand All @@ -243,7 +230,6 @@ install_binary(){
move_binary(){
echo_date "开始替换v2ray二进制文件... "
mv /tmp/v2ray/v2ray /koolshare/bin/v2ray
mv /tmp/v2ray/v2ctl /koolshare/bin/
chmod +x /koolshare/bin/v2*
V2RAY_LOCAL_VER=`/koolshare/bin/v2ray -version 2>/dev/null | head -n 1 | cut -d " " -f2`
V2RAY_LOCAL_DATE=`/koolshare/bin/v2ray -version 2>/dev/null | head -n 1 | cut -d " " -f5`
Expand Down
89 changes: 0 additions & 89 deletions shadowsocks/scripts/ss_xray.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,51 +69,6 @@ get_latest_version_backup(){
exit 1
}

# get_latest_version_backup(){
# rm -rf /tmp/xray_latest_info.txt
# echo_date "检测xray最新版本..."
# curl --connect-timeout 8 -s $url_back/latest.txt > /tmp/xray_latest_info.txt
# if [ "$?" == "0" ];then
# if [ -z "`cat /tmp/xray_latest_info.txt`" ];then
# echo_date "获取xray最新版本信息失败！退出！"
# echo_date "==================================================================="
# echo XU6J03M6
# exit 1
# fi
# if [ -n "`cat /tmp/xray_latest_info.txt|grep "404"`" ];then
# echo_date "获取xray最新版本信息失败！退出！"
# echo_date "==================================================================="
# echo XU6J03M6
# exit 1
# fi
# V2VERSION=`cat /tmp/xray_latest_info.txt | sed 's/v//g'`
# echo_date "检测到xray最新版本：v$V2VERSION"
# if [ ! -f "/koolshare/bin/xray" -o ! -f "/koolshare/bin/v2ctl" ];then
# echo_date "xray安装文件丢失！重新下载！"
# CUR_VER="0"
# else
# CUR_VER=`xray -version 2>/dev/null | head -n 1 | cut -d " " -f2 | sed 's/v//g'` || 0
# echo_date "当前已安装xray版本：v$CUR_VER"
# fi
# COMP=`versioncmp $V2VERSION $CUR_VER`
# if [ "$COMP" == "1" ];then
# [ "$CUR_VER" != "0" ] && echo_date "xray已安装版本号低于最新版本，开始更新程序..."
# update_now_backup v$V2VERSION
# else
# xray_LOCAL_VER=`/koolshare/bin/xray -version 2>/dev/null | head -n 1 | cut -d " " -f2`
# xray_LOCAL_DATE=`/koolshare/bin/xray -version 2>/dev/null | head -n 1 | cut -d " " -f5`
# [ -n "$xray_LOCAL_VER" ] && dbus set ss_basic_xray_version="$xray_LOCAL_VER"
# [ -n "$xray_LOCAL_DATE" ] && dbus set ss_basic_xray_date="$xray_LOCAL_DATE"
# echo_date "xray已安装版本已经是最新，退出更新程序!"
# fi
# else
# echo_date "获取xray最新版本信息失败！请检查到你的网络！"
# echo_date "==================================================================="
# echo XU6J03M6
# exit 1
# fi
# }

update_now(){
rm -rf /tmp/xray
mkdir -p /tmp/xray && cd /tmp/xray
Expand Down Expand Up @@ -155,50 +110,6 @@ update_now_backup(){
exit 1
}

# update_now_backup(){
# rm -rf /tmp/xray
# mkdir -p /tmp/xray && cd /tmp/xray
#
# echo_date "开始下载校验文件：md5sum.txt"
# wget --no-check-certificate --timeout=20 -qO - $url_back/$1/md5sum.txt > /tmp/xray/md5sum.txt
# if [ "$?" != "0" ];then
# echo_date "md5sum.txt下载失败！"
# md5sum_ok=0
# else
# md5sum_ok=1
# echo_date "md5sum.txt下载成功..."
# fi
#
# echo_date "开始下载xray程序"
# wget --no-check-certificate --timeout=20 --tries=1 $url_back/$1/xray
# if [ "$?" != "0" ];then
# echo_date "xray下载失败！"
# xray_ok=0
# else
# xray_ok=1
# echo_date "xray程序下载成功..."
# fi
#
# echo_date "开始下载v2ctl程序"
# wget --no-check-certificate --timeout=20 --tries=1 $url_back/$1/v2ctl
# if [ "$?" != "0" ];then
# echo_date "v2ctl下载失败！"
# v2ctl_ok=0
# else
# v2ctl_ok=1
# echo_date "v2ctl程序下载成功..."
# fi
#
# if [ "$md5sum_ok=1" ] && [ "$xray_ok=1" ] && [ "$v2ctl_ok=1" ];then
# check_md5sum
# else
# echo_date "下载失败，请检查你的网络！"
# echo_date "==================================================================="
# echo XU6J03M6
# exit 1
# fi
# }

check_md5sum(){
cd /tmp/xray
echo_date "校验下载的文件!"
Expand Down
Loading

0 comments on commit 1aa41ae

Please sign in to comment.