diff --git a/scripts/merge_packages.sh b/scripts/merge_packages.sh index 1fa590e..c7a039a 100644 --- a/scripts/merge_packages.sh +++ b/scripts/merge_packages.sh @@ -1,8 +1,8 @@ function merge_package(){ 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 - 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 if [[ $1 == *'/trunk/'* || $1 == *'/branches/'* ]]; then @@ -14,7 +14,7 @@ function merge_package(){ mv $pn package/custom/ } 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(){ if [ ! -d "feed/$1" ]; then