JENKINS-26673 - Environment Script leaves files in /tmp on Ubuntu

jenkinsci · Nov 15, 2015 · 334383d · 334383d
1 parent c6fdd27
commit 334383d
Showing 1 changed file with 16 additions and 10 deletions.
diff --git a/src/main/java/com/lookout/jenkins/EnvironmentScript.java b/src/main/java/com/lookout/jenkins/EnvironmentScript.java
@@ -98,25 +98,31 @@ private Environment generateEnvironment(AbstractBuild<?, ?> build,
             final Launcher launcher,
             final BuildListener listener) throws IOException, InterruptedException {
         // First we create the script in a temporary directory.
-        FilePath ws = build.getWorkspace(), scriptFile;
+        FilePath ws = build.getWorkspace(), scriptFile = null;
+
+        ByteArrayOutputStream commandOutput = new ByteArrayOutputStream();
+        int returnCode = -1;
         try {
             // Create a file in the system temporary directory with our script in it.
             scriptFile = ws.createTextTempFile(build.getProject().getName(), ".sh", script, false);
+
+            // Then we execute the script, putting STDOUT in commandOutput.
+            returnCode = launcher.launch().cmds(buildCommandLine(scriptFile))
+                    .envs(build.getEnvironment(listener))
+                    .stderr(listener.getLogger())
+                    .stdout(commandOutput)
+                    .pwd(ws).join();
         } catch (IOException e) {
             Util.displayIOException(e, listener);
             e.printStackTrace(listener.fatalError(Messages.EnvironmentScriptWrapper_UnableToProduceScript()));
             return null;
+        } finally {
+            // Make sure we clean scriptFile
+            if (scriptFile != null && scriptFile.exists()) {
+                scriptFile.delete();
+            }
         }
 
-        // Then we execute the script, putting STDOUT in commandOutput.
-        ByteArrayOutputStream commandOutput = new ByteArrayOutputStream();
-        int returnCode =
-                launcher.launch().cmds(buildCommandLine(scriptFile))
-                        .envs(build.getEnvironment(listener))
-                        .stderr(listener.getLogger())
-                        .stdout(commandOutput)
-                        .pwd(ws).join();
-
         if (returnCode != 0) {
             listener.fatalError(Messages.EnvironmentScriptWrapper_UnableToExecuteScript(returnCode));
             return null;