From 420e50f23a34d7b8122ff80b63db1844553c8003 Mon Sep 17 00:00:00 2001 From: Johannes Wirth Date: Tue, 7 Oct 2025 14:54:09 +0200 Subject: [PATCH] Use TMP_DIR for calls --- toolflow/src/main/scala/com/minres/tgc/hammer/Main.scala | 2 +- toolflow/src/main/scala/com/minres/tgc/hammer/tasks/Task.scala | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/toolflow/src/main/scala/com/minres/tgc/hammer/Main.scala b/toolflow/src/main/scala/com/minres/tgc/hammer/Main.scala index eec00bb..fd31a56 100644 --- a/toolflow/src/main/scala/com/minres/tgc/hammer/Main.scala +++ b/toolflow/src/main/scala/com/minres/tgc/hammer/Main.scala @@ -36,6 +36,7 @@ object Main { logger.debug(s"Subcommand requires ${tasks.size} tasks") try { tasks.foreach(_.run()) + c.cleanup() } catch { case e: AssertException => logger.error(s"Error during task execution, see above!") @@ -43,7 +44,6 @@ object Main { logger.error(s"General exception ${e.getMessage}") e.printStackTrace() } - c.cleanup() case _ => logger.error(s"Found no subcommand, see help below") conf.printHelp() diff --git a/toolflow/src/main/scala/com/minres/tgc/hammer/tasks/Task.scala b/toolflow/src/main/scala/com/minres/tgc/hammer/tasks/Task.scala index 0e13993..10382c9 100644 --- a/toolflow/src/main/scala/com/minres/tgc/hammer/tasks/Task.scala +++ b/toolflow/src/main/scala/com/minres/tgc/hammer/tasks/Task.scala @@ -1,5 +1,6 @@ package com.minres.tgc.hammer.tasks +import com.minres.tgc.hammer.Global.TMP_DIR import com.minres.tgc.hammer.Main import com.minres.tgc.hammer.util.Logging import os.{Path, Shellable} @@ -26,6 +27,6 @@ trait TaskImpl[T <: Task : ClassTag] extends Task with Logging[T] { os.Inherit else logFile - os.proc("bash", "-c", command).call(stdout = output) + os.proc("bash", "-c", command).call(cwd = TMP_DIR, stdout = output) } }