From f5419ce02a5ef4230b4ae5bc843d86ba7dcc3853 Mon Sep 17 00:00:00 2001 From: Don Armstrong Date: Wed, 30 May 2012 15:52:13 -0700 Subject: [PATCH] use trap to remove tmp directory on failure to avoid hiding mpost failures --- stepmake/stepmake/metafont-rules.make | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/stepmake/stepmake/metafont-rules.make b/stepmake/stepmake/metafont-rules.make index 6d81f550ac..9febf64566 100644 --- a/stepmake/stepmake/metafont-rules.make +++ b/stepmake/stepmake/metafont-rules.make @@ -19,13 +19,13 @@ $(outdir)/%.tfm $(outdir)/%.log: %.mf # the soft link for mf2pt1.mp is for recent mpost versions # which no longer dump a .mem file $(outdir)/%.pfb: %.mf $(outdir)/mf2pt1.mem - TMP=`mktemp -d $(outdir)/pfbtemp.XXXXXXXXX` \ - && ( cd $$TMP \ + TMP=`mktemp -d $(outdir)/pfbtemp.XXXXXXXXX`; \ + trap "rm -rf '$TMP'" 0; \ + ( cd $$TMP \ && ln -s ../mf2pt1.mem . \ && ln -s ../../mf2pt1.mp . \ && MFINPUTS=$(abs-src-dir):..:: $(buildscript-dir)/mf2pt1 $(MF2PT1_OPTIONS) $< $(METAFONT_QUIET)) \ - && mv $$TMP/*pfb $(outdir); \ - rm -rf $$TMP + && mv $$TMP/*pfb $(outdir) && rm -rf "$TMP"; # since recent mpost versions no longer create a mem file, we create a dummy # file to satisfy the dependency (which gets overwritten in case an older -- 2.39.2