From c5fedb35dac0af6334934e57fad5881d7e41f02a Mon Sep 17 00:00:00 2001
From: John Doe <klever1988@protonmail.com>
Date: Tue, 12 Oct 2021 05:29:34 +0800
Subject: [PATCH] fix

---
 scripts/merge_packages.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/scripts/merge_packages.sh b/scripts/merge_packages.sh
index 364ed0b..3db6145 100644
--- a/scripts/merge_packages.sh
+++ b/scripts/merge_packages.sh
@@ -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