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

fix autocore for r1s

Browse Source
This commit is contained in:
John Doe
2022-04-30 04:58:04 +08:00
parent 87393a2623
commit ea0afa48f1
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/merge_packages.sh
View File

@@ -1,8 +1,8 @@
function merge_package(){ function merge_package(){
pn=`echo $1 | rev | cut -d'/' -f 1 | rev` pn=`echo $1 | rev | cut -d'/' -f 1 | rev`
find package/ -follow -name $pn -not -path "package/custom/*" | xargs -rt rm -r find package/ -follow -name $pn -not -path "package/custom/*" | xargs -rt rm -rf
if [ ! -z "$2" ]; then if [ ! -z "$2" ]; then
find package/ -follow -name $2 -not -path "package/custom/*" | xargs -rt rm -r find package/ -follow -name $2 -not -path "package/custom/*" | xargs -rt rm -rf
fi fi
if [[ $1 == *'/trunk/'* || $1 == *'/branches/'* ]]; then if [[ $1 == *'/trunk/'* || $1 == *'/branches/'* ]]; then
@@ -14,7 +14,7 @@ function merge_package(){
mv $pn package/custom/ mv $pn package/custom/
} }
function drop_package(){ function drop_package(){
find package/ -follow -name $1 -not -path "package/custom/*" | xargs -rt rm -r find package/ -follow -name $1 -not -path "package/custom/*" | xargs -rt rm -rf
} }
function merge_feed(){ function merge_feed(){
if [ ! -d "feed/$1" ]; then if [ ! -d "feed/$1" ]; then