From 3070c573dd5aafd12ceb112bb3f52e8a8549bd63 Mon Sep 17 00:00:00 2001 From: John Doe Date: Sun, 7 Mar 2021 20:23:49 +0800 Subject: [PATCH] script: fix package merging #3 --- merge_packages.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/merge_packages.sh b/merge_packages.sh index e8b5362..4f025b6 100644 --- a/merge_packages.sh +++ b/merge_packages.sh @@ -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 &&\