From 784f99a4064b05356a6c05b3acd28cdf8593501a Mon Sep 17 00:00:00 2001 From: Philip Wadler Date: Sun, 5 Jan 2020 22:36:10 +0000 Subject: [PATCH] Small changes to send-marks --- courses/tspl/send_marks.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/courses/tspl/send_marks.sh b/courses/tspl/send_marks.sh index 516c4e73..b20e2f23 100755 --- a/courses/tspl/send_marks.sh +++ b/courses/tspl/send_marks.sh @@ -6,7 +6,7 @@ # # This script assumes the following folder structure: # -# $DIR/sXXXXXXX/cw$CW/$FILE +# $DIR/sXXXXXXX/$CW/$FILE # # The variable DIR refers to the directory passed in as an argument to the # script. The variable XXXXXXX refers to the student ID, and it is assumed @@ -14,9 +14,9 @@ # # sXXXXXXX@sms.ed.ac.uk # -# is a valid email address. The variable $CW refers to the number for of the -# coursework of which the students are meant to be notified. The directory -# DIR/sXXXXXXX/cwY/ should only contain a single file, which should be +# is a valid email address. The variable $CW refers to the coursework +# of which the students are meant to be notified (e.g., cw1). The directory +# DIR/sXXXXXXX/$CW/ should only contain a single file, which should be # specified using the FILE parameter. # # Usage: @@ -32,12 +32,12 @@ shift FILE="$1" shift -for ATTACHMENT in "${DIR%/}/s"*"/cw$CW/$FILE"; do +for ATTACHMENT in "${DIR%/}/s"*"/$CW/$FILE"; do SUBJ="Mark for coursework $CW" BODY="" SID=$(echo "$ATTACHMENT" | sed 's|.*/\(s[0-9]\{7\}\)/.*|\1|') ADDR="$SID@sms.ed.ac.uk" - CMD="echo \"$BODY\" | mail -s \"$SUBJ\" -a \"$ATTACHMENT\" \"$ADDR\"" + CMD="echo \"$BODY\" | mail -c wadler@inf.ed.ac.uk -s \"$SUBJ\" -a \"$ATTACHMENT\" \"$ADDR\"" echo "You are about to run the following command:" echo -e "\n$CMD\n" read -p "Are you sure? " -n 1 -r