From 1ef0c851c20bcd3e92c8e316a88ee1aa419244f7 Mon Sep 17 00:00:00 2001
From: clinton-hall <fock_wulf@hotmail.com>
Date: Thu, 28 Mar 2013 20:46:15 +1030
Subject: [PATCH] do not move nzbToMedia folder

---
 .../current-stable/nzbget-postprocess.sh           | 14 +++++---------
 .../testing/nzbget-postprocess.sh                  | 14 +++++---------
 2 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/nzbget-postprocessing-files/current-stable/nzbget-postprocess.sh b/nzbget-postprocessing-files/current-stable/nzbget-postprocess.sh
index 465a14ce..854d1397 100644
--- a/nzbget-postprocessing-files/current-stable/nzbget-postprocess.sh
+++ b/nzbget-postprocessing-files/current-stable/nzbget-postprocess.sh
@@ -191,18 +191,14 @@ do_exit() {
 	if [ "$Debug" = "yes" ]; then echo "[DETAIL] Post-Process: Executing function 'do_exit' with argument $1" | tee -a $tmplog; fi
 	nzbStatus=0
 	if [ "$1" -ne "$POSTPROCESS_SUCCESS" ]; then 
-		if [ "$Delete_Failed" = "yes" -a "$NZBPP_DIRECTORY" != "$ConfigDir" -a -d "$NZBPP_DIRECTORY" ]; then
-			cd $NZBPP_DIRECTORY
-			rm * >/dev/null 2>&1
+		if [ "$Delete_Failed" = "yes" -a "$NZBPP_DIRECTORY" != "$ConfigDir" -a -d "$NZBPP_DIRECTORY" -a ! -d "$NZBPP_DIRECTORY/.git" ]; then
+			cd ..
+			rm -rf $NZBPP_DIRECTORY >/dev/null 2>&1
+		elif [ "$NZBPP_DIRECTORY" != "$ConfigDir" -a "$Failed_Directory" != "" -a -d "$NZBPP_DIRECTORY" -a ! -d "$NZBPP_DIRECTORY/.git" ]; then
 			cd ..
-			rmdir $NZBPP_DIRECTORY
-		elif [ "$NZBPP_DIRECTORY" != "$ConfigDir" -a "$Failed_Directory" != "" -a -d "$NZBPP_DIRECTORY" ]; then
-			cd $NZBPP_DIRECTORY
 			mkdir $Failed_Directory
 			mkdir $Failed_Directory/$NZBPP_CATEGORY
-			mv * $Failed_Directory/$NZBPP_CATEGORY >/dev/null 2>&1
-			cd ..
-			rmdir $NZBPP_DIRECTORY
+			mv $NZBPP_DIRECTORY $Failed_Directory/$NZBPP_CATEGORY >/dev/null 2>&1
     			NZBPP_DIRECTORY=$Failed_Directory
     			cd $NZBPP_DIRECTORY
 		fi
diff --git a/nzbget-postprocessing-files/testing/nzbget-postprocess.sh b/nzbget-postprocessing-files/testing/nzbget-postprocess.sh
index 0bfe3aac..b6ce1de9 100755
--- a/nzbget-postprocessing-files/testing/nzbget-postprocess.sh
+++ b/nzbget-postprocessing-files/testing/nzbget-postprocess.sh
@@ -221,19 +221,15 @@ do_exit() {
 	if [ "$Debug" = "yes" ]; then echo "[DETAIL] Post-Process: Executing function 'do_exit' with argument $1" | tee -a $tmplog; fi
 	nzbStatus=0
 	if [ "$1" -ne "$POSTPROCESS_SUCCESS" ]; then 
-		if [ "$Delete_Failed" = "yes" -a "$NZBPP_DIRECTORY" != "$ConfigDir" -a -d "$NZBPP_DIRECTORY" ]; then
-			cd $NZBPP_DIRECTORY
-			rm * >/dev/null 2>&1
+		if [ "$Delete_Failed" = "yes" -a "$NZBPP_DIRECTORY" != "$ConfigDir" -a -d "$NZBPP_DIRECTORY" -a ! -d "$NZBPP_DIRECTORY/.git" ]; then
+			cd ..
+			rm -rf $NZBPP_DIRECTORY >/dev/null 2>&1
+		elif [ "$NZBPP_DIRECTORY" != "$ConfigDir" -a "$Failed_Directory" != "" -a -d "$NZBPP_DIRECTORY" -a ! -d "$NZBPP_DIRECTORY/.git" ]; then
 			cd ..
-			rmdir $NZBPP_DIRECTORY
-		elif [ "$NZBPP_DIRECTORY" != "$ConfigDir" -a "$Failed_Directory" != "" -a -d "$NZBPP_DIRECTORY" ]; then
-			cd $NZBPP_DIRECTORY
 			mkdir $Failed_Directory
 			mkdir $Failed_Directory/$NZBPP_CATEGORY
 			mkdir $Failed_Directory/$NZBPP_CATEGORY/$NZBPP_NZBNAME
-			mv * $Failed_Directory/$NZBPP_CATEGORY/$NZBPP_NZBNAME >/dev/null 2>&1
-			cd ..
-			rmdir $NZBPP_DIRECTORY
+			mv $NZBPP_DIRECTORY $Failed_Directory/$NZBPP_CATEGORY/$NZBPP_NZBNAME >/dev/null 2>&1
     			NZBPP_DIRECTORY=$Failed_Directory/$NZBPP_CATEGORY/$NZBPP_NZBNAME
     			cd $NZBPP_DIRECTORY
 		fi