diff --git a/src/ru/pulsar/jenkins/library/utils/FileUtils.groovy b/src/ru/pulsar/jenkins/library/utils/FileUtils.groovy index c0fba7b..e7a0f6c 100644 --- a/src/ru/pulsar/jenkins/library/utils/FileUtils.groovy +++ b/src/ru/pulsar/jenkins/library/utils/FileUtils.groovy @@ -5,6 +5,8 @@ import jenkins.model.Jenkins import ru.pulsar.jenkins.library.IStepExecutor import ru.pulsar.jenkins.library.ioc.ContextRegistry +import java.nio.file.Path + class FileUtils { static FilePath getFilePath(String path) { @@ -30,6 +32,13 @@ class FileUtils { def env = steps.env(); - return filePath.getRemote().replaceAll("^$env.WORKSPACE/", "").toString() + Path workspacePath = new File(env.WORKSPACE).toPath() + Path rawFilePath = new File(filePath.getRemote()).toPath() + + return workspacePath.relativize(rawFilePath) + .toString() + .replaceAll('\\\\\\\\', '/') + .replaceAll('\\\\', '/') + .toString() } }