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

Fix substitution errors with non-bash shells

Browse source 
The scripts has the hashbang for /bin/sh, I assume for  portability
reasons. Some unix systems symlink sh to bash, others like Ubuntu (in my
case) symlink sh to dash or some other basic shell which do not support
the variable substitution. This is used for sending mail at this moment.

For portability reasons I check if we're in a bash shell, if so use the
bash variable substitution as this is available/faster than an external
command. If not as fallback sed will be used, which most of the cases is
present also. Even busybox has some basic sed available. This will
maximize portability usage of this script.
This commit is contained in:
Serhat Gülçiçek 2012-12-23 18:16:45 +01:00 • committed by Clinton Hall
commit 5372f8d4aa
1 changed files with 30 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

40
nzbget-postprocessing-files/9.0/bin/nzbget-postprocess.sh
View file

@ -155,6 +155,19 @@ nzbToMedia() {
fi fi
} }
replaceVarBy() {
if [ "$Debug" = "yes" ]; then echo "[DETAIL] Post-Process: Executing function 'replaceVarBy'. Going to replace '${2}' in '${1}' by '${3}'" ; fi
# If we're not using Bash use sed, as we need to support as much as systems possible, also those running sh/dash etc
if [ -n "${BASH_VERSION}" ]; then
REPLACEDRESULT="${1/${2}/${3}}"
else
REPLACEDRESULT=$(echo "${1}" | sed "s/${2}/${3}/")
fi
if [ "$Debug" = "yes" ]; then echo "[DETAIL] Post-Process: replace result: ${REPLACEDRESULT}" ; fi
}
# Pass on postprocess exit codes to external scripts for handling failed downloads # Pass on postprocess exit codes to external scripts for handling failed downloads
do_exit() { do_exit() {
if [ "$Debug" = "yes" ]; then echo "[DETAIL] Post-Process: Executing function 'do_exit' with argument $1" ; fi if [ "$Debug" = "yes" ]; then echo "[DETAIL] Post-Process: Executing function 'do_exit' with argument $1" ; fi
@ -162,24 +175,31 @@ do_exit() {
if [ "$1" -ne "$POSTPROCESS_SUCCESS" ]; then nzbStatus=1 ; fi if [ "$1" -ne "$POSTPROCESS_SUCCESS" ]; then nzbStatus=1 ; fi
script=none script=none
nzbToMedia $nzbStatus nzbToMedia $nzbStatus
Email_Subject="${Email_Subject/<name>/$NZBPP_NZBFILENAME}" echo "[DETAIL] after calling nzbToMedia"
Email_Subject="${Email_Subject/<cat>/$NZBPP_CATEGORY}" replaceVarBy "${Email_Subject}" "<name>" "${NZBPP_NZBFILENAME}"
Email_Subject="${Email_Subject/<script>/$script}" replaceVarBy "${REPLACEDRESULT}" "<cat>" "${NZBPP_CATEGORY}"
Email_Message="${Email_Message/<name>/$NZBPP_NZBFILENAME}" replaceVarBy "${REPLACEDRESULT}" "<script>" "${script}"
Email_Message="${Email_Message/<cat>/$NZBPP_CATEGORY}" Email_Subject="${REPLACEDRESULT}"
Email_Message="${Email_Message/<script>/$script}" replaceVarBy "${Email_Message}" "<name>" "${NZBPP_NZBFILENAME}"
replaceVarBy "${REPLACEDRESULT}" "<cat>" "${NZBPP_CATEGORY}"
replaceVarBy "${REPLACEDRESULT}" "<script>" "${script}"
Email_Message="${REPLACEDRESULT}"
if [ "$Email_successful" = "yes" -a "$nzbStatus" = 0 ]; then if [ "$Email_successful" = "yes" -a "$nzbStatus" = 0 ]; then
User="" User=""
if [ -n "$Email_User" -a -n "$Email_Pass" ]; then User="-xu $Email_User -xp $Email_Pass" ; fi if [ -n "$Email_User" -a -n "$Email_Pass" ]; then User="-xu $Email_User -xp $Email_Pass" ; fi
Email_Subject="${Email_Subject/<status>/completed}" replaceVarBy "${Email_Subject}" "<status>" "completed"
Email_Message="${Email_Message/<status>/completed}" Email_Subject="${REPLACEDRESULT}"
replaceVarBy "${Email_Message}" "<status>" "completed"
Email_Message="${REPLACEDRESULT}"
$sendEmail -f "$Email_From" -t "$Email_To" -s "$Email_Server" $User -u "$Email_Subject" -m "$Email_Message" $sendEmail -f "$Email_From" -t "$Email_To" -s "$Email_Server" $User -u "$Email_Subject" -m "$Email_Message"
fi fi
if [ "$Email_failed" = "yes" -a "$nzbStatus" != 0 ]; then if [ "$Email_failed" = "yes" -a "$nzbStatus" != 0 ]; then
User="" User=""
if [ -n "$Email_User" -a -n "$Email_Pass" ]; then User="-xu $Email_User -xp $Email_Pass" ; fi if [ -n "$Email_User" -a -n "$Email_Pass" ]; then User="-xu $Email_User -xp $Email_Pass" ; fi
Email_Subject="${Email_Subject/<status>/failed}" replaceVarBy "${Email_Subject}" "<status>" "failed"
Email_Message="${Email_Message/<status>/failed}" Email_Subject="${REPLACEDRESULT}"
replaceVarBy "${Email_Message}" "<status>" "failed"
Email_Message="${REPLACEDRESULT}"
$sendEmail -f "$Email_From" -t "$Email_To" -s "$Email_Server" $User -u "$Email_Subject" -m "$Email_Message" $sendEmail -f "$Email_From" -t "$Email_To" -s "$Email_Server" $User -u "$Email_Subject" -m "$Email_Message"
fi fi
exit $1 exit $1