Skip to content

Commit b54827e

Browse files
committed
Use sendmail instead of mail command
1 parent 903dcfe commit b54827e

File tree

1 file changed

+11
-5
lines changed

1 file changed

+11
-5
lines changed

ftpgrab.sh

+11-5
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
###################################################################################
44
# #
5-
# FTPGrab v4.2.0 #
5+
# FTPGrab v4.2.1 #
66
# #
77
# Simple script to grab your files from a remote FTP server. #
88
# #
@@ -167,8 +167,8 @@ function ftpgrabDownloadFile() {
167167
if [ -z "$LOG" ] && [ ${DL_HIDE_PROGRESS} -eq 0 -a -f "$_DL_STATUS_FILE" -a -s "$_DL_STATUS_FILE" ]
168168
then
169169
ftpgrabEcho ""
170-
< "$_DL_STATUS_FILE" | sed s/\\r/\\n/g | sed '/\.\.\.\.\.\.\.\. /!d'
171-
< "$_DL_STATUS_FILE" | sed s/\\r/\\n/g | sed '/\.\.\.\.\.\.\.\. /!d' >> "$LOG_FILE"
170+
cat "$_DL_STATUS_FILE" | sed s/\\r/\\n/g | sed '/\.\.\.\.\.\.\.\. /!d'
171+
cat "$_DL_STATUS_FILE" | sed s/\\r/\\n/g | sed '/\.\.\.\.\.\.\.\. /!d' >> "$LOG_FILE"
172172
ftpgrabEcho ""
173173
fi
174174
fi
@@ -550,7 +550,7 @@ mkdir -p "$HASH_DIR"
550550
if [ ! -d "$HASH_DIR" ]; then ftpgrabEcho "ERROR: Cannot create dir $HASH_DIR with $(whoami) user"; exit 1; fi
551551
if [ ! -w "$HASH_DIR" ]; then ftpgrabEcho "ERROR: Dir $HASH_DIR is not writable by $(whoami)"; exit 1; fi
552552

553-
ftpgrabEcho "FTPGrab v4.2.0 ($BASENAME_FILE - $(date +"%Y/%m/%d %H:%M:%S"))"
553+
ftpgrabEcho "FTPGrab v4.2.1 ($BASENAME_FILE - $(date +"%Y/%m/%d %H:%M:%S"))"
554554
ftpgrabEcho "--------------"
555555

556556
# Check required packages
@@ -700,6 +700,12 @@ ftpgrabEcho "Total time spent: $(ftpgrabFormatSeconds $((endtime - starttime)))"
700700
rm -f "$PID_FILE"
701701

702702
# Send logs
703-
if [ ! -z "$EMAIL_LOG" ]; then < "$LOG_FILE" | mail -s "ftpgrab on $(hostname)" ${EMAIL_LOG}; fi
703+
if [ ! -z "$EMAIL_LOG" ]; then
704+
(
705+
echo "To: ${EMAIL_LOG}";
706+
echo "Subject: FTPGrab on $(hostname)";
707+
cat "$LOG_FILE"
708+
) | sendmail -t
709+
fi
704710

705711
exit 0

0 commit comments

Comments
 (0)