[JENKINS-30671] Add ability to expan tokens for file name

jenkinsci · Sep 28, 2015 · c7afc24 · c7afc24
1 parent ac25660
commit c7afc24
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/src/main/java/org/jvnet/hudson/plugins/repositoryconnector/ArtifactDeployer.java b/src/main/java/org/jvnet/hudson/plugins/repositoryconnector/ArtifactDeployer.java
@@ -114,12 +114,13 @@ public boolean perform(AbstractBuild<?, ?> build, Launcher launcher, BuildListen
                 final String artifactId = TokenMacro.expandAll(build, listener, a.getArtifactId());
                 final String groupId = TokenMacro.expandAll(build, listener, a.getGroupId());
                 final String packaging = TokenMacro.expandAll(build, listener, a.getExtension());
+                final String targetFileName = TokenMacro.expandAll(build, listener, a.getTargetFileName());
 
-                Artifact aTmp = new Artifact(groupId, artifactId, classifier, version, packaging, a.getTargetFileName());
+                Artifact aTmp = new Artifact(groupId, artifactId, classifier, version, packaging, targetFileName);
 
-                String fileName = aTmp.getTargetFileName();
-                FilePath source = new FilePath(build.getWorkspace(), fileName);
-                String f = new File(fileName).getName();
+                String aTmpFileName = aTmp.getTargetFileName();
+                FilePath source = new FilePath(build.getWorkspace(), aTmpFileName);
+                String f = new File(aTmpFileName).getName();
                 int dotPos = f.lastIndexOf(".");
                 String extension = f.substring(dotPos + 1);
                 final File targetFile = File.createTempFile(f, "." + extension);