From 98c470b031df66be5138c2a56951d15164c253a5 Mon Sep 17 00:00:00 2001 From: "Henry So, Jr." Date: Wed, 3 Feb 2016 21:23:26 -0500 Subject: [PATCH] Removed warning deleting files that shouldn't exist. Part of the fix for #126. --- harness.sh | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/harness.sh b/harness.sh index 401f5d93..ee00de6a 100644 --- a/harness.sh +++ b/harness.sh @@ -250,7 +250,7 @@ function gabc_gtex_clean { outfile="$filename.out" expfile="${filename%.gabc}.tex" - $RM "$filename" "$filename.log" "$outfile" "$outfile-" "$expfile" \ + $RM -f "$filename" "$filename.log" "$outfile" "$outfile-" "$expfile" \ "$expfile-" } function gabc_gtex_accept { @@ -312,7 +312,7 @@ function gabc_dump_clean { outfile="$filename.out" expfile="${filename%.gabc}.dump" - $RM "$filename" "$filename.log" "$outfile" "$outfile-" "$expfile" \ + $RM -f "$filename" "$filename.log" "$outfile" "$outfile-" "$expfile" \ "$expfile-" } function gabc_dump_accept { @@ -380,7 +380,7 @@ function gabc_gabc_clean { outfile="$filename.out" expfile="${filename%.gabc}.exp" - $RM "$filename" "$filename.log" "$outfile" "$outfile-" "$expfile" \ + $RM -f "$filename" "$filename.log" "$outfile" "$outfile-" "$expfile" \ "$expfile-" } function gabc_gabc_accept { @@ -511,7 +511,11 @@ function clean_typeset_result { filename="$1" outdir="$filename.out" cd .. - $RM -r "$filename" "${filename%.$2}.pdf" "$outdir" + $RM -f "$filename" "${filename%.$2}.pdf" + if [ -d "$outdir" ] + then + $RM -r "$outdir" + fi } function accept_typeset_result { filebase="$(basename "$1")" @@ -585,7 +589,7 @@ function gabc_output_clean { filebase="${filename%.gabc}" clean_typeset_result "$filename" gabc - $RM "$filebase"-*.gtex "$filebase.tex" + $RM -f "$filebase"-*.gtex "$filebase.tex" } function gabc_output_accept { accept_typeset_result "$1" gabc