github/nzbToMedia
1
0
Fork 0
mirror of https://github.com/clinton-hall/nzbToMedia.git synced 2025-08-20 21:33:13 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into dev

Browse source
This commit is contained in:
clinton-hall 2013-04-08 07:03:36 +09:30
commit ded99d40f1
7 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
nzbget-postprocessing-files/current-stable/nzbget-postprocess.conf
View file

@ -150,7 +150,7 @@ Email_To=
Email_Server= Email_Server=
# Server uses tsl (auto, yes, no). # Server uses tsl (auto, yes, no).
Tsl=auto Tls=auto
# Enter your smtp server user name (if required) # Enter your smtp server user name (if required)
Email_User= Email_User=

4
nzbget-postprocessing-files/current-stable/nzbget-postprocess.sh
View file

@ -258,7 +258,7 @@ do_exit() {
Email_Message="$Email_Message <br>Log Result" Email_Message="$Email_Message <br>Log Result"
while read line; do Email_Message="$Email_Message <br>$line"; done < $tmplog while read line; do Email_Message="$Email_Message <br>$line"; done < $tmplog
fi fi
$sendEmail -f "$Email_From" -t "$Email_To" -s "$Email_Server" -o "tsl=$Tsl" -o "message-content-type=html" $User -u "$Email_Subject" -m "$Email_Message" $sendEmail -f "$Email_From" -t "$Email_To" -s "$Email_Server" -o "tls=$Tls" -o "message-content-type=html" $User -u "$Email_Subject" -m "$Email_Message"
fi; done fi; done
for item in $Email_failed; do for item in $Email_failed; do
if [ "${NZBPP_CATEGORY}" = "$item" -o "$item" = "all" ] && [ "$nzbStatus" != 0 ]; then if [ "${NZBPP_CATEGORY}" = "$item" -o "$item" = "all" ] && [ "$nzbStatus" != 0 ]; then
@ -272,7 +272,7 @@ do_exit() {
Email_Message="$Email_Message <br>nLog Result" Email_Message="$Email_Message <br>nLog Result"
while read line; do Email_Message="$Email_Message <br>$line"; done < $tmplog while read line; do Email_Message="$Email_Message <br>$line"; done < $tmplog
fi fi
$sendEmail -f "$Email_From" -t "$Email_To" -s "$Email_Server" -o "tsl=$Tsl" -o "message-content-type=html" $User -u "$Email_Subject" -m "$Email_Message" $sendEmail -f "$Email_From" -t "$Email_To" -s "$Email_Server" -o "tls=$Tls" -o "message-content-type=html" $User -u "$Email_Subject" -m "$Email_Message"
fi; done fi; done
exit $1 exit $1
} }

2
nzbget-postprocessing-files/previous/nzbget-postprocess.conf
View file

@ -149,7 +149,7 @@ Email_To=
Email_Server= Email_Server=
# Server uses tsl (auto, yes, no). # Server uses tsl (auto, yes, no).
Tsl=auto Tls=auto
# Enter your smtp server user name (if required) # Enter your smtp server user name (if required)
Email_User= Email_User=

4
nzbget-postprocessing-files/previous/nzbget-postprocess.sh
View file

@ -227,7 +227,7 @@ do_exit() {
Email_Message="$Email_Message <br>Log Result" Email_Message="$Email_Message <br>Log Result"
while read line; do Email_Message="$Email_Message <br>$line"; done < $tmplog while read line; do Email_Message="$Email_Message <br>$line"; done < $tmplog
fi fi
$sendEmail -f "$Email_From" -t "$Email_To" -s "$Email_Server" -o "tsl=$Tsl" -o "message-content-type=html" $User -u "$Email_Subject" -m "$Email_Message" $sendEmail -f "$Email_From" -t "$Email_To" -s "$Email_Server" -o "tls=$Tls" -o "message-content-type=html" $User -u "$Email_Subject" -m "$Email_Message"
fi; done fi; done
for item in $Email_failed; do for item in $Email_failed; do
if [ "${NZBPP_CATEGORY}" = "$item" -a "$nzbStatus" != 0 ]; then if [ "${NZBPP_CATEGORY}" = "$item" -a "$nzbStatus" != 0 ]; then
@ -241,7 +241,7 @@ do_exit() {
Email_Message="$Email_Message <br>nLog Result" Email_Message="$Email_Message <br>nLog Result"
while read line; do Email_Message="$Email_Message <br>$line"; done < $tmplog while read line; do Email_Message="$Email_Message <br>$line"; done < $tmplog
fi fi
$sendEmail -f "$Email_From" -t "$Email_To" -s "$Email_Server" -o "tsl=$Tsl" -o "message-content-type=html" $User -u "$Email_Subject" -m "$Email_Message" $sendEmail -f "$Email_From" -t "$Email_To" -s "$Email_Server" -o "tls=$Tls" -o "message-content-type=html" $User -u "$Email_Subject" -m "$Email_Message"
fi; done fi; done
exit $1 exit $1
} }

2
nzbget-postprocessing-files/testing/README.md
View file

@ -1 +1 @@
Currently testing NZBGet V10+ Currently testing NZBGet V11

2
nzbget-postprocessing-files/testing/nzbget-postprocess.conf
View file

@ -150,7 +150,7 @@ Email_To=
Email_Server= Email_Server=
# Server uses tsl (auto, yes, no). # Server uses tsl (auto, yes, no).
Tsl=auto Tls=auto
# Enter your smtp server user name (if required) # Enter your smtp server user name (if required)
Email_User= Email_User=

4
nzbget-postprocessing-files/testing/nzbget-postprocess.sh
View file

@ -258,7 +258,7 @@ do_exit() {
Email_Message="$Email_Message <br>Log Result" Email_Message="$Email_Message <br>Log Result"
while read line; do Email_Message="$Email_Message <br>$line"; done < $tmplog while read line; do Email_Message="$Email_Message <br>$line"; done < $tmplog
fi fi
$sendEmail -f "$Email_From" -t "$Email_To" -s "$Email_Server" -o "tsl=$Tsl" -o "message-content-type=html" $User -u "$Email_Subject" -m "$Email_Message" $sendEmail -f "$Email_From" -t "$Email_To" -s "$Email_Server" -o "tls=$Tls" -o "message-content-type=html" $User -u "$Email_Subject" -m "$Email_Message"
fi; done fi; done
for item in $Email_failed; do for item in $Email_failed; do
if [ "${NZBPP_CATEGORY}" = "$item" -o "$item" = "all" ] && [ "$nzbStatus" != 0 ]; then if [ "${NZBPP_CATEGORY}" = "$item" -o "$item" = "all" ] && [ "$nzbStatus" != 0 ]; then
@ -272,7 +272,7 @@ do_exit() {
Email_Message="$Email_Message <br>nLog Result" Email_Message="$Email_Message <br>nLog Result"
while read line; do Email_Message="$Email_Message <br>$line"; done < $tmplog while read line; do Email_Message="$Email_Message <br>$line"; done < $tmplog
fi fi
$sendEmail -f "$Email_From" -t "$Email_To" -s "$Email_Server" -o "tsl=$Tsl" -o "message-content-type=html" $User -u "$Email_Subject" -m "$Email_Message" $sendEmail -f "$Email_From" -t "$Email_To" -s "$Email_Server" -o "tls=$Tls" -o "message-content-type=html" $User -u "$Email_Subject" -m "$Email_Message"
fi; done fi; done
exit $1 exit $1
} }