yanistyle/nanopi-openwrt-r1s-h3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
John Doe
2023-07-04 14:54:44 +08:00
parent 409b26929d
commit 68e3ea980f
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
scripts/merge_packages.sh
View File

@@ -7,6 +7,11 @@ function merge_package(){
if [[ $1 == *'/trunk/'* || $1 == *'/branches/'* ]]; then if [[ $1 == *'/trunk/'* || $1 == *'/branches/'* ]]; then
svn export $1 svn export $1
elif [[ $1 == *'/tree/'* ]]; then
repo=`echo $1|awk -F'/tree/' '{print $1}'`
git clone --depth=1 --single-branch $repo .tmprepo
mv .tmprepo/$pn $pn
rm .tmprepo -rf
else else
git clone --depth=1 --single-branch $3 $1 git clone --depth=1 --single-branch $3 $1
rm -rf $pn/.git rm -rf $pn/.git
@@ -42,11 +47,10 @@ merge_package "-b 18.06 https://github.com/jerrykuku/luci-theme-argon"
merge_package https://github.com/vernesong/OpenClash/trunk/luci-app-openclash merge_package https://github.com/vernesong/OpenClash/trunk/luci-app-openclash
merge_package https://github.com/NateLol/luci-app-oled merge_package https://github.com/NateLol/luci-app-oled
merge_package "-b lede https://github.com/pymumu/luci-app-smartdns" merge_package "-b lede https://github.com/pymumu/luci-app-smartdns"
drop_package brook merge_package https://github.com/xiaorouji/openwrt-passwall/tree/packages/brook
drop_package chinadns-ng merge_package https://github.com/xiaorouji/openwrt-passwall/tree/packages/chinadns-ng
drop_package trojan-go merge_package https://github.com/xiaorouji/openwrt-passwall/tree/packages/trojan-go
drop_package trojan-plus merge_package https://github.com/xiaorouji/openwrt-passwall/tree/packages/trojan-plus
merge_package "-b luci https://github.com/xiaorouji/openwrt-passwall"
merge_package https://github.com/jerrykuku/lua-maxminddb merge_package https://github.com/jerrykuku/lua-maxminddb
merge_package https://github.com/jerrykuku/luci-app-vssr merge_package https://github.com/jerrykuku/luci-app-vssr
merge_package https://github.com/kongfl888/luci-app-adguardhome merge_package https://github.com/kongfl888/luci-app-adguardhome