clean up temp files in js optimizer

2 files changed, 6 insertions, 2 deletions

diff --git a/tools/js_optimizer.py b/tools/js_optimizer.py
index 5bed4cb7..7a8335db 100644
--- a/tools/js_optimizer.py
+++ b/tools/js_optimizer.py
@@ -26,7 +26,8 @@ def run_on_chunk(command):
   f.close()
   return filename
 
-def run(filename, passes, js_engine, jcache):
+def run_on_js(filename, passes, js_engine, jcache):
+
   if jcache: shared.JCache.ensure()
 
   if type(passes) == str:
@@ -168,3 +169,6 @@ def run(filename, passes, js_engine, jcache):
 
   return filename
 
+def run(filename, passes, js_engine, jcache):
+  return temp_files.run_and_clean(lambda: run_on_js(filename, passes, js_engine, jcache))
+
diff --git a/tools/shared.py b/tools/shared.py
index d5340806..8c0583f6 100644
--- a/tools/shared.py
+++ b/tools/shared.py
@@ -430,7 +430,7 @@ class TempFiles:
 
   def run_and_clean(self, func):
     try:
-      func()
+      return func()
     finally:
       self.clean()