OpenWrt
/
small-package
mirror of https://github.com/kenzok8/small-package
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

update 2022-07-08 20:18:51

This commit is contained in:
github-actions[bot] 2022-07-08 20:18:51 +08:00
parent bf3f2e7169
commit 8399daf1ab
6 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
luci-app-bypass/Makefile
View File

@ -43,11 +43,11 @@ define Package/$(PKG_NAME)/config
config PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks_Libev_Client config PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks_Libev_Client
bool "Include Shadowsocks Libev Client" bool "Include Shadowsocks Libev Client"
default y if i386||x86_64||arm default y if i386||x86_64||arm||aarch64
config PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks_Libev_Server config PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks_Libev_Server
bool "Include Shadowsocks Libev Server" bool "Include Shadowsocks Libev Server"
default y if i386||x86_64||arm default y if i386||x86_64||arm||aarch64
config PACKAGE_$(PKG_NAME)_INCLUDE_ShadowsocksR_Libev_Client config PACKAGE_$(PKG_NAME)_INCLUDE_ShadowsocksR_Libev_Client
bool "Include ShadowsocksR Libev Client" bool "Include ShadowsocksR Libev Client"
@ -55,11 +55,11 @@ config PACKAGE_$(PKG_NAME)_INCLUDE_ShadowsocksR_Libev_Client
config PACKAGE_$(PKG_NAME)_INCLUDE_ShadowsocksR_Libev_Server config PACKAGE_$(PKG_NAME)_INCLUDE_ShadowsocksR_Libev_Server
bool "Include ShadowsocksR Libev Server" bool "Include ShadowsocksR Libev Server"
default y if i386||x86_64||arm default y if i386||x86_64||aarch64
config PACKAGE_$(PKG_NAME)_INCLUDE_Simple_Obfs config PACKAGE_$(PKG_NAME)_INCLUDE_Simple_Obfs
bool "Include Shadowsocks Simple Obfs Plugin" bool "Include Shadowsocks Simple Obfs Plugin"
default y if i386||x86_64||arm default y if i386||x86_64||arm||aarch64
config PACKAGE_$(PKG_NAME)_INCLUDE_V2ray_plugin config PACKAGE_$(PKG_NAME)_INCLUDE_V2ray_plugin
bool "Include Shadowsocks V2ray Plugin" bool "Include Shadowsocks V2ray Plugin"

1
luci-app-bypass/luasrc/model/cbi/bypass/app_update.lua
View File

@ -7,6 +7,5 @@ s = m:section(TypedSection, "global", translate("App Update"),
"</font>") "</font>")
s.anonymous = true s.anonymous = true
s:append(Template("bypass/xray_version")) s:append(Template("bypass/xray_version"))
s:append(Template("bypass/trojan_go_version"))
return m return m

2
luci-app-bypass/luasrc/model/cbi/bypass/client-config.lua
View File

@ -709,7 +709,7 @@ o:depends({type = "v2ray", v2ray_protocol = "vless", xtls = true, insecure = fal
o.description = translate("If you have a self-signed certificate,please check the box") o.description = translate("If you have a self-signed certificate,please check the box")
o = s:option(DummyValue, "upload", translate("Upload")) o = s:option(DummyValue, "upload", translate("Upload"))
o.template = "shadowsocksr/certupload" o.template = "bypass/certupload"
o:depends("certificate", 1) o:depends("certificate", 1)
cert_dir = "/etc/ssl/private/" cert_dir = "/etc/ssl/private/"

2
luci-app-bypass/root/etc/init.d/bypass
View File

@ -72,7 +72,7 @@ f_bin(){
ssr) ret=$(which ssr-redir);; ssr) ret=$(which ssr-redir);;
ssr-local) ret=$(which ssr-local);; ssr-local) ret=$(which ssr-local);;
ssr-server) ret=$(which ssr-server);; ssr-server) ret=$(which ssr-server);;
v2ray) ret=$(which xray);; v2ray) ret=$(which xray) || ret=$(which v2ray);;
hysteria) ret=$(which hysteria);; hysteria) ret=$(which hysteria);;
trojan) ret=$(which trojan-plus);; trojan) ret=$(which trojan-plus);;
naiveproxy) ret=$(which naive);; naiveproxy) ret=$(which naive);;

10
luci-app-bypass/root/etc/uci-defaults/luci-bypass
View File

@ -11,15 +11,19 @@ uci batch <<EOF
commit firewall commit firewall
chmod +x /etc/init.d/bypass /usr/share/bypass/* >/dev/null 2>&1 chmod +x /etc/init.d/bypass /usr/share/bypass/* >/dev/null 2>&1
rm -rf /tmp/luci-modulecache/ rm -rf /tmp/luci-modulecache/
killall -HUP rpcd 2>/dev/null
EOF EOF
if [[ "$(grep "option type 'vless'" /etc/config/bypass)" || "$(grep "option type 'vmess'" /etc/config/bypass)" ]]; then if [[ "$(grep "option type 'vless'" /etc/config/bypass)" || "$(grep "option type 'vmess'" /etc/config/bypass)" ]]; then
sed -i "s/option uuid/option vmess_id/" /etc/config/bypass sed -i "s/option uuid/option vmess_id/" /etc/config/bypass
for i in {0..100} for i in {0..100}
do do
uci -q set bypass.@servers[$i].type='v2ray' if [ "$(uci -q get bypass.@servers[$i].type)" == 'vless' ];then
[ "$(uci -q get bypass.@servers[$i].type)" == 'vless' ] && uci -q set bypass.@servers[$i].v2ray_protocol='vless' || uci -q set bypass.@servers[$i].v2ray_protocol='vmess' uci -q set bypass.@servers[$i].type='v2ray'
uci -q set bypass.@servers[$i].v2ray_protocol='vless'
elif [ "$(uci -q get bypass.@servers[$i].type)" == 'vless' ];then
uci -q set bypass.@servers[$i].type='v2ray'
uci -q set bypass.@servers[$i].v2ray_protocol='vmess'
fi
done done
uci commit bypass uci commit bypass
fi fi

2
luci-app-bypass/root/usr/share/bypass/by-switch
View File

@ -33,7 +33,7 @@ f_bin(){
case $1 in case $1 in
ss)w=$(which ss-local);; ss)w=$(which ss-local);;
ssr)w=$(which ssr-local);; ssr)w=$(which ssr-local);;
v2ray)w=$(which xray);; v2ray)w=$(which xray)||w=$(which r2ray);;
trojan)w=$(which trojan-plus);; trojan)w=$(which trojan-plus);;
naiveproxy)w=$(which naive);; naiveproxy)w=$(which naive);;
esac esac