mirrors/nanopi-openwrt
1
0
Fork 0
mirror of https://github.com/stupidloud/nanopi-openwrt.git synced 2025-06-03 22:03:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
John Doe 2021-10-12 05:29:34 +08:00
parent e454e6a256
commit c5fedb35da
No known key found for this signature in database
GPG Key ID: 30F190E0C359CB4F
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
scripts/merge_packages.sh
View File

@ -1,6 +1,6 @@
function merge_package(){
pn=`echo $1 | rev | cut -d'/' -f 1 | rev`
find package/ feeds/ \( -type l -o -type d \) -name $pn | xargs -r rm -r
find package/ feeds/ \( -type l -o -type d \) -name $pn -not -path "package/custom/*" | xargs -r rm -r
if [ ! -z "$2" ]; then
find package/ feeds/ \( -type l -o -type d \) -name $2 | xargs -r rm -r
fi
@ -11,7 +11,7 @@ function merge_package(){
git clone $3 --depth=1 $1
rm -rf $pn/.git
fi
mv $pn package/
mv $pn package/custom/
}
function merge_feed(){
if [ ! -d "feed/$1" ]; then
@ -22,6 +22,7 @@ function merge_feed(){
./scripts/feeds install -a -p $1
}
mkdir -p package/custom
merge_feed nas "https://github.com/linkease/nas-packages;master"
merge_feed nas_luci "https://github.com/linkease/nas-packages-luci;main"
merge_package https://github.com/klever1988/openwrt-mos/trunk/luci-app-mosdns