diff -r 2969ee4a6cee -r ca9c1cf929fa marking2/mk --- a/marking2/mk Fri Nov 22 17:01:55 2019 +0000 +++ b/marking2/mk Tue Nov 26 01:22:36 2019 +0000 @@ -1,34 +1,27 @@ -#!/bin/sh -###set -e +#!/bin/bash +set -euo pipefail + trap "exit" INT -files=${1:-assignment20187-*} +files=${1:-assignment2019scala-*/Part7} for sd in $files; do cd $sd echo $sd touch . - cp ../../../marking2/*.sh . - cp ../../../marking2/danube_test1.scala . - cp ../../../marking2/danube_test2.scala . - cp ../../../marking2/docdiff_test1.scala . - cp ../../../marking2/docdiff_test2.scala . - cp ../../../marking2/docdiff_test3.scala . - cp ../../../marking2/docdiff_test4.scala . - cp ../../../marking2/movies.csv . - cp ../../../marking2/ratings.csv . + cp ../../../../../marking2/docdiff_test.sh . + cp ../../../../../marking2/docdiff_test1.scala . + cp ../../../../../marking2/docdiff_test2.scala . + cp ../../../../../marking2/docdiff_test3.scala . + cp ../../../../../marking2/docdiff_test4.scala . ./docdiff_test.sh output - ./danube_test.sh output - rm *.sh - rm danube_test1.scala - rm danube_test2.scala + rm docdiff_test.sh rm docdiff_test1.scala rm docdiff_test2.scala rm docdiff_test3.scala rm docdiff_test4.scala - rm ratings.csv - rm movies.csv + cd .. cd .. done