File tree 1 file changed +11
-5
lines changed
1 file changed +11
-5
lines changed Original file line number Diff line number Diff line change 2
2
3
3
# ##################################################################################
4
4
# #
5
- # FTPGrab v4.2.0 #
5
+ # FTPGrab v4.2.1 #
6
6
# #
7
7
# Simple script to grab your files from a remote FTP server. #
8
8
# #
@@ -167,8 +167,8 @@ function ftpgrabDownloadFile() {
167
167
if [ -z " $LOG " ] && [ ${DL_HIDE_PROGRESS} -eq 0 -a -f " $_DL_STATUS_FILE " -a -s " $_DL_STATUS_FILE " ]
168
168
then
169
169
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 "
172
172
ftpgrabEcho " "
173
173
fi
174
174
fi
@@ -550,7 +550,7 @@ mkdir -p "$HASH_DIR"
550
550
if [ ! -d " $HASH_DIR " ]; then ftpgrabEcho " ERROR: Cannot create dir $HASH_DIR with $( whoami) user" ; exit 1; fi
551
551
if [ ! -w " $HASH_DIR " ]; then ftpgrabEcho " ERROR: Dir $HASH_DIR is not writable by $( whoami) " ; exit 1; fi
552
552
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" ) )"
554
554
ftpgrabEcho " --------------"
555
555
556
556
# Check required packages
@@ -700,6 +700,12 @@ ftpgrabEcho "Total time spent: $(ftpgrabFormatSeconds $((endtime - starttime)))"
700
700
rm -f " $PID_FILE "
701
701
702
702
# 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
704
710
705
711
exit 0
You can’t perform that action at this time.
0 commit comments