From 7499c3ab4a03573bf762f7e0b13c8370da047752 Mon Sep 17 00:00:00 2001 From: Nikita Gryzlov Date: Fri, 26 Nov 2021 12:57:22 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A0=D0=B0=D0=B7=D1=80=D0=B5=D1=88=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D0=BB=D0=BE=D0=BA=D0=B0=D0=BB=D1=8C=D0=BD?= =?UTF-8?q?=D0=BE=D0=B3=D0=BE=20=D0=BF=D1=83=D1=82=D0=B8=20=D0=BD=D0=B0=20?= =?UTF-8?q?windows?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/ru/pulsar/jenkins/library/utils/FileUtils.groovy | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) 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() } }