Skip to content

Commit

Permalink
Merge pull request gregorio-project#128 from henryso/develop
Browse files Browse the repository at this point in the history
Removed warning deleting files that shouldn't exist.
  • Loading branch information
henryso committed Feb 4, 2016
2 parents 1fafa4b + 98c470b commit 90ca7c1
Showing 1 changed file with 9 additions and 5 deletions.
14 changes: 9 additions & 5 deletions harness.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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")"
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 90ca7c1

Please sign in to comment.