do not move nzbToMedia folder

This commit is contained in:
clinton-hall 2013-03-28 20:46:15 +10:30
commit 1ef0c851c2
2 changed files with 10 additions and 18 deletions

View file

@ -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 if [ "$Debug" = "yes" ]; then echo "[DETAIL] Post-Process: Executing function 'do_exit' with argument $1" | tee -a $tmplog; fi
nzbStatus=0 nzbStatus=0
if [ "$1" -ne "$POSTPROCESS_SUCCESS" ]; then if [ "$1" -ne "$POSTPROCESS_SUCCESS" ]; then
if [ "$Delete_Failed" = "yes" -a "$NZBPP_DIRECTORY" != "$ConfigDir" -a -d "$NZBPP_DIRECTORY" ]; then if [ "$Delete_Failed" = "yes" -a "$NZBPP_DIRECTORY" != "$ConfigDir" -a -d "$NZBPP_DIRECTORY" -a ! -d "$NZBPP_DIRECTORY/.git" ]; then
cd $NZBPP_DIRECTORY cd ..
rm * >/dev/null 2>&1 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 .. 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
mkdir $Failed_Directory/$NZBPP_CATEGORY mkdir $Failed_Directory/$NZBPP_CATEGORY
mv * $Failed_Directory/$NZBPP_CATEGORY >/dev/null 2>&1 mv $NZBPP_DIRECTORY $Failed_Directory/$NZBPP_CATEGORY >/dev/null 2>&1
cd ..
rmdir $NZBPP_DIRECTORY
NZBPP_DIRECTORY=$Failed_Directory NZBPP_DIRECTORY=$Failed_Directory
cd $NZBPP_DIRECTORY cd $NZBPP_DIRECTORY
fi fi

View file

@ -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 if [ "$Debug" = "yes" ]; then echo "[DETAIL] Post-Process: Executing function 'do_exit' with argument $1" | tee -a $tmplog; fi
nzbStatus=0 nzbStatus=0
if [ "$1" -ne "$POSTPROCESS_SUCCESS" ]; then if [ "$1" -ne "$POSTPROCESS_SUCCESS" ]; then
if [ "$Delete_Failed" = "yes" -a "$NZBPP_DIRECTORY" != "$ConfigDir" -a -d "$NZBPP_DIRECTORY" ]; then if [ "$Delete_Failed" = "yes" -a "$NZBPP_DIRECTORY" != "$ConfigDir" -a -d "$NZBPP_DIRECTORY" -a ! -d "$NZBPP_DIRECTORY/.git" ]; then
cd $NZBPP_DIRECTORY cd ..
rm * >/dev/null 2>&1 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 .. 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
mkdir $Failed_Directory/$NZBPP_CATEGORY mkdir $Failed_Directory/$NZBPP_CATEGORY
mkdir $Failed_Directory/$NZBPP_CATEGORY/$NZBPP_NZBNAME mkdir $Failed_Directory/$NZBPP_CATEGORY/$NZBPP_NZBNAME
mv * $Failed_Directory/$NZBPP_CATEGORY/$NZBPP_NZBNAME >/dev/null 2>&1 mv $NZBPP_DIRECTORY $Failed_Directory/$NZBPP_CATEGORY/$NZBPP_NZBNAME >/dev/null 2>&1
cd ..
rmdir $NZBPP_DIRECTORY
NZBPP_DIRECTORY=$Failed_Directory/$NZBPP_CATEGORY/$NZBPP_NZBNAME NZBPP_DIRECTORY=$Failed_Directory/$NZBPP_CATEGORY/$NZBPP_NZBNAME
cd $NZBPP_DIRECTORY cd $NZBPP_DIRECTORY
fi fi