Test for no-op libraryPath

jenkinsci · Sep 17, 2024 · 506c1df · 506c1df
1 parent b748000
commit 506c1df
Showing 1 changed file with 14 additions and 4 deletions.
diff --git a/src/main/java/org/jenkinsci/plugins/workflow/libs/LibraryRecord.java b/src/main/java/org/jenkinsci/plugins/workflow/libs/LibraryRecord.java
@@ -24,6 +24,7 @@
 
 package org.jenkinsci.plugins.workflow.libs;
 
+import java.nio.file.Paths;
 import java.util.Collections;
 import java.util.Set;
 import java.util.TreeSet;
@@ -70,16 +71,25 @@ public final class LibraryRecord {
         this.changelog = changelog;
         this.cachingConfiguration = cachingConfiguration;
         logString = this.name + "@" + this.version;
-        if (StringUtils.isNotBlank(libraryPath) && !libraryPath.equals(".")) {
+        if (onTheRoadToNowhere(libraryPath)) {
+            this.libraryPath = "";
+            this.directoryName = directoryNameFor(name, version, String.valueOf(trusted), source);
+        } else {
             this.libraryPath = libraryPath;
             this.directoryName = directoryNameFor(name, version, String.valueOf(trusted), source, libraryPath);
             logString += " from libraryPath: " + libraryPath;
-        } else {
-            this.libraryPath = "";
-            this.directoryName = directoryNameFor(name, version, String.valueOf(trusted), source);
         }
     }
 
+    private boolean onTheRoadToNowhere(String libraryPath) {
+        if (StringUtils.isBlank(libraryPath)) {
+            return true;
+        }
+        String currentDir = Paths.get("").toAbsolutePath().normalize().toString();
+        String libraryDir = Paths.get(libraryPath).toAbsolutePath().normalize().toString();
+        return currentDir.equals(libraryDir);
+    }
+
     @Exported
     public String getName() {
         return name;