xinb
/
X-OpenWrt
mirror of https://github.com/xopenwrt/X-OpenWrt-New.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

合并上游改动: xray -> xray-core

This commit is contained in:
Hyy2001X 2021-02-04 16:44:36 +08:00
parent 9c656867cc
commit 7000a86314
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Scripts/AutoBuild_Function.sh
View File

@ -24,9 +24,9 @@ Diy_Part1_Base() {
sed -i 's/143/143,25,5222/' package/lean/helloworld/luci-app-ssr-plus/root/etc/init.d/shadowsocksr sed -i 's/143/143,25,5222/' package/lean/helloworld/luci-app-ssr-plus/root/etc/init.d/shadowsocksr
fi fi
if [[ "${INCLUDE_Keep_Latest_Xray}" == "true" ]];then if [[ "${INCLUDE_Keep_Latest_Xray}" == "true" ]];then
Update_Makefile xray package/lean/helloworld/xray Update_Makefile xray-core package/lean/helloworld/xray-core
Update_Makefile v2ray package/lean/v2ray # Update_Makefile v2ray package/lean/v2ray
Update_Makefile v2ray-plugin package/lean/v2ray-plugin # Update_Makefile v2ray-plugin package/lean/v2ray-plugin
fi fi
if [[ "${INCLUDE_AutoBuild_Tools}" == "true" ]];then if [[ "${INCLUDE_AutoBuild_Tools}" == "true" ]];then
Replace_File Scripts/AutoBuild_Tools.sh package/base-files/files/bin Replace_File Scripts/AutoBuild_Tools.sh package/base-files/files/bin
@ -187,7 +187,7 @@ Update_Makefile() {
sed -i "s?PKG_VERSION:=${Source_Version}?PKG_VERSION:=${Offical_Version}?g" ${Makefile} sed -i "s?PKG_VERSION:=${Source_Version}?PKG_VERSION:=${Offical_Version}?g" ${Makefile}
wget -q "${PKG_DL_URL}${Offical_Version}?" -O /tmp/tmp_file wget -q "${PKG_DL_URL}${Offical_Version}?" -O /tmp/tmp_file
if [[ "$?" -eq 0 ]];then if [[ "$?" -eq 0 ]];then
Offical_HASH=$(sha256sum /tmp/tmp_file | cut -d ' ' -f1) Offical_HASH="$(sha256sum /tmp/tmp_file | cut -d ' ' -f1)"
sed -i "s?PKG_HASH:=${Source_HASH}?PKG_HASH:=${Offical_HASH}?g" ${Makefile} sed -i "s?PKG_HASH:=${Source_HASH}?PKG_HASH:=${Offical_HASH}?g" ${Makefile}
else else
echo "Failed to update the package [${PKG_NAME}],skip update ..." echo "Failed to update the package [${PKG_NAME}],skip update ..."