Support subject (utf-8) encoding.
This commit is contained in:
parent
43a253ad4a
commit
3802e50061
56
rcopy.sh
56
rcopy.sh
@ -117,8 +117,11 @@ else
|
||||
if $MANUAL ; then
|
||||
echo -e "\n$msg\n"
|
||||
else
|
||||
datum=`date +"%d.%m.%Y"`
|
||||
echo -e "To:${admin_email}\n${content_type}\nSubject:Backup Errors $company -- $datum\n${msg}\n" | /usr/sbin/sendmail -F "Errors BACKUP $company" -f $from_address $admin_email
|
||||
datum="$(date +"%d.%m.%Y")"
|
||||
subject="Backup Errors $company -- $datum"
|
||||
subject_utf8="$(echo "$subject" | iconv -t UTF8)"
|
||||
subject_utf8_encoded="=?utf-8?B?$(echo $subject_utf8 | base64 --wrap=0)?="
|
||||
echo -e "To:${admin_email}\n${content_type}\nSubject:${subject_utf8_encoded}\n${msg}\n" | /usr/sbin/sendmail -F "Errors BACKUP $company" -f $from_address $admin_email
|
||||
fi
|
||||
|
||||
echo ""
|
||||
@ -139,8 +142,11 @@ if $check_mountpoint ; then
|
||||
if $MANUAL ; then
|
||||
echo -e "\n$msg\n"
|
||||
else
|
||||
datum=`date +"%d.%m.%Y"`
|
||||
echo -e "To:${admin_email}\nSubject:Backup Errors $company -- $datum\n${msg}\n" | /usr/sbin/sendmail -F "Errors BACKUP $company" -f $from_address $admin_email
|
||||
datum="$(date +"%d.%m.%Y")"
|
||||
subject="Backup Errors $company -- $datum"
|
||||
subject_utf8="$(echo "$subject" | iconv -t UTF8)"
|
||||
subject_utf8_encoded="=?utf-8?B?$(echo $subject_utf8 | base64 --wrap=0)?="
|
||||
echo -e "To:${admin_email}\nSubject:${subject_utf8_encoded}\n${msg}\n" | /usr/sbin/sendmail -F "Errors BACKUP $company" -f $from_address $admin_email
|
||||
fi
|
||||
exit 1
|
||||
fi
|
||||
@ -195,8 +201,11 @@ if $extern_usb_disk || $extern_sata_disk || $intern_disk ; then
|
||||
if $MANUAL ; then
|
||||
echo -e "\n$msg\n"
|
||||
else
|
||||
datum=`date +"%d.%m.%Y"`
|
||||
echo -e "To:${admin_email}\n${content_type}\nSubject:Backup Errors $company -- $datum\n${msg}\n" | /usr/sbin/sendmail -F "Errors BACKUP $company" -f $from_address $admin_email
|
||||
datum="$(date +"%d.%m.%Y")"
|
||||
subject="Backup Errors $company -- $datum"
|
||||
subject_utf8="$(echo "$subject" | iconv -t UTF8)"
|
||||
subject_utf8_encoded="=?utf-8?B?$(echo $subject_utf8 | base64 --wrap=0)?="
|
||||
echo -e "To:${admin_email}\n${content_type}\nSubject:${subject_utf8_encoded}\n${msg}\n" | /usr/sbin/sendmail -F "Errors BACKUP $company" -f $from_address $admin_email
|
||||
fi
|
||||
exit 1
|
||||
|
||||
@ -206,8 +215,11 @@ if $extern_usb_disk || $extern_sata_disk || $intern_disk ; then
|
||||
if $MANUAL ; then
|
||||
echo -e "\n$msg\n"
|
||||
else
|
||||
datum=`date +"%d.%m.%Y"`
|
||||
echo -e "To:${admin_email}\n${content_type}\nSubject:Backup Errors $company -- $datum\n${msg}\n" | /usr/sbin/sendmail -F "Errors BACKUP $company" -f $from_address $admin_email
|
||||
datum="$(date +"%d.%m.%Y")"
|
||||
subject="Backup Errors $company -- $datum"
|
||||
subject_utf8="$(echo "$subject" | iconv -t UTF8)"
|
||||
subject_utf8_encoded="=?utf-8?B?$(echo $subject_utf8 | base64 --wrap=0)?="
|
||||
echo -e "To:${admin_email}\n${content_type}\nSubject:${subject_utf8_encoded}\n${msg}\n" | /usr/sbin/sendmail -F "Errors BACKUP $company" -f $from_address $admin_email
|
||||
fi
|
||||
exit 1
|
||||
fi
|
||||
@ -219,8 +231,11 @@ elif $remote_disk ; then
|
||||
if $MANUAL ; then
|
||||
echo -e "\n$msg\n"
|
||||
else
|
||||
datum=`date +"%d.%m.%Y"`
|
||||
echo -e "To:${admin_email}\n${content_type}\nSubject:Backup Errors $company -- $datum\n${msg}\n" | /usr/sbin/sendmail -F "Errors BACKUP $company" -f $from_address $admin_email
|
||||
datum="$(date +"%d.%m.%Y")"
|
||||
subject="Backup Errors $company -- $datum"
|
||||
subject_utf8="$(echo "$subject" | iconv -t UTF8)"
|
||||
subject_utf8_encoded="=?utf-8?B?$(echo $subject_utf8 | base64 --wrap=0)?="
|
||||
echo -e "To:${admin_email}\n${content_type}\nSubject:${subject_utf8_encoded}\n${msg}\n" | /usr/sbin/sendmail -F "Errors BACKUP $company" -f $from_address $admin_email
|
||||
fi
|
||||
exit 1
|
||||
fi
|
||||
@ -248,8 +263,11 @@ if [ ! -O $AGENT ]; then
|
||||
if $MANUAL ; then
|
||||
echo -e "\n$msg\n"
|
||||
else
|
||||
datum=`date +"%d.%m.%Y"`
|
||||
echo -e "To:${admin_email}\n${content_type}\nSubject:Backup Errors $company -- $datum\n${msg}\n" | /usr/sbin/sendmail -F "Errors BACKUP $company" -f $from_address $admin_email
|
||||
datum="$(date +"%d.%m.%Y")"
|
||||
subject="Backup Errors $company -- $datum"
|
||||
subject_utf8="$(echo "$subject" | iconv -t UTF8)"
|
||||
subject_utf8_encoded="=?utf-8?B?$(echo $subject_utf8 | base64 --wrap=0)?="
|
||||
echo -e "To:${admin_email}\n${content_type}\nSubject:${subject_utf8_encoded}\n${msg}\n" | /usr/sbin/sendmail -F "Errors BACKUP $company" -f $from_address $admin_email
|
||||
fi
|
||||
|
||||
exit 1
|
||||
@ -267,8 +285,11 @@ if [ ! `$ps aux | $grep -e"^$USER" | $grep "$SSH_AGENT_PID" | $grep ssh-agent |
|
||||
if $MANUAL ; then
|
||||
echo -e "$msg\n"
|
||||
else
|
||||
datum=`date +"%d.%m.%Y"`
|
||||
echo -e "To:${admin_email}\n${content_type}\nSubject:Backup Errors $company -- $datum\n${msg}\n" | /usr/sbin/sendmail -F "Errors BACKUP $company" -f $from_address $admin_email
|
||||
datum="$(date +"%d.%m.%Y")"
|
||||
subject="Backup Errors $company -- $datum"
|
||||
subject_utf8="$(echo "$subject" | iconv -t UTF8)"
|
||||
subject_utf8_encoded="=?utf-8?B?$(echo $subject_utf8 | base64 --wrap=0)?="
|
||||
echo -e "To:${admin_email}\n${content_type}\nSubject:${subject_utf8_encoded}\n${msg}\n" | /usr/sbin/sendmail -F "Errors BACKUP $company" -f $from_address $admin_email
|
||||
fi
|
||||
|
||||
exit 1
|
||||
@ -287,8 +308,11 @@ if [ ! $? -eq 0 ]; then
|
||||
if $MANUAL ; then
|
||||
echo -e "\n$msg\n"
|
||||
else
|
||||
datum=`date +"%d.%m.%Y"`
|
||||
echo -e "To:${admin_email}\n${content_type}\nSubject:Backup Errors $company -- $datum\n${msg}\n" | /usr/sbin/sendmail -F "Errors BACKUP $company" -f $from_address $admin_email
|
||||
datum="$(date +"%d.%m.%Y")"
|
||||
subject="Backup Errors $company -- $datum"
|
||||
subject_utf8="$(echo "$subject" | iconv -t UTF8)"
|
||||
subject_utf8_encoded="=?utf-8?B?$(echo $subject_utf8 | base64 --wrap=0)?="
|
||||
echo -e "To:${admin_email}\n${content_type}\nSubject:${subject_utf8_encoded}\n${msg}\n" | /usr/sbin/sendmail -F "Errors BACKUP $company" -f $from_address $admin_email
|
||||
fi
|
||||
|
||||
exit 1
|
||||
|
Loading…
Reference in New Issue
Block a user