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

script: fix package merging #3

Browse Source
This commit is contained in:
John Doe
2021-03-07 20:23:49 +08:00
parent 83f4fb4304
commit 3070c573dd
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
merge_packages.sh
View File

@@ -1,8 +1,8 @@
function merge_package(){
pn=`echo $1 | rev | cut -d'/' -f 1 | rev`
find package/ -type d -name $pn | xargs -r rm -r
find package/ \( -type l -o -type d \) -name $pn | xargs -r rm -r
if [ ! -z "$2" ]; then
find package/ -type d -name $2 | xargs -r rm -r
find package/ \( -type l -o -type d \) -name $2 | xargs -r rm -r
fi
if [[ $1 == *'/trunk/'* ]]; then
@@ -20,6 +20,8 @@ merge_package https://github.com/jerrykuku/luci-theme-argon luci-theme-argon "-b
merge_package https://github.com/coolsnowwolf/lede/trunk/package/lean/luci-app-cifsd luci-app-ksmbd
merge_package https://github.com/coolsnowwolf/packages/trunk/kernel/ksmbd
merge_package https://github.com/coolsnowwolf/packages/trunk/net/ksmbd-tools
merge_package https://github.com/jerrykuku/luci-app-vssr
merge_package https://github.com/jerrykuku/lua-maxminddb
if [ $DEVICE = 'r2s' ]; then
mkdir -p target/linux/rockchip/armv8/base-files/usr/bin &&\