Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2026-05-06 20:45:26 +02:00
Code Issues Packages Projects Releases Activity

Fix Windows specific paths

Browse Source 
Pushed-by: Rene Pfeuffer<rene.pfeuffer@cloudogu.com>
Co-authored-by: René Pfeuffer<rene.pfeuffer@cloudogu.com>
Committed-by: René Pfeuffer<rene.pfeuffer@cloudogu.com>
This commit is contained in:
Rene Pfeuffer
2024-01-09 10:17:01 +01:00
parent b397aaacce
commit 587863b0a6
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
scm-packaging/windows/src/main/fs/conf/config.yml
View File

@@ -20,12 +20,12 @@ https:
redirectHttpToHttps: false
# Temp directory used for jetty webserver. The temporary directory for internal operations can be configured as "workDir" in webapp.
tempDir: /var/cache/scm/work
tempDir: work
# logging
log:
## Destination of logging files
logDir: /var/log/scm
logDir: logs
rootLevel: WARN
enableFileAppender: true
enableConsoleAppender: true
@@ -38,7 +38,7 @@ webapp:
## Sets explicit working directory for internal processes, empty means default java temp dir
workDir:
## Home directory "scm-home" which is also set for classpath
homeDir: /var/lib/scm
homeDir:
cache:
dataFile:
enabled: true

10
scm-webapp/src/main/java/sonia/scm/plugin/PluginTransformer.java
View File

@@ -28,6 +28,7 @@ import org.eclipse.transformer.AppOption;
import org.eclipse.transformer.TransformOptions;
import org.eclipse.transformer.Transformer;
import org.eclipse.transformer.jakarta.JakartaTransform;
import org.slf4j.LoggerFactory;
import java.io.File;
import java.io.IOException;
@@ -39,18 +40,20 @@ import java.util.Comparator;
import java.util.function.Function;
import java.util.stream.Stream;
import static org.eclipse.transformer.Transformer.ResultCode.SUCCESS_RC;
public class PluginTransformer {
private PluginTransformer() {
}
public static void transform(Path pluginPath) {
Transformer transformer = new Transformer(createOptions(pluginPath.toString()));
Transformer transformer = new Transformer(LoggerFactory.getLogger(Transformer.class), createOptions(pluginPath.toString()));
transformer.inputPath = pluginPath.resolve("classes").toString();
transformer.outputName = pluginPath + "-transformed";
Transformer.ResultCode resultCode = transformer.run();
if (resultCode.ordinal() == 0) {
if (resultCode == SUCCESS_RC) {
try {
try (Stream<Path> paths = Files.walk(Path.of(transformer.inputPath))) {
paths
@@ -64,8 +67,7 @@ public class PluginTransformer {
}
} else {
throw new PluginTransformException(
String.format("Failed to transform downloaded plugin: %s",
pluginPath)
String.format("Failed to transform downloaded plugin %s: %s", pluginPath, resultCode)
);
}
}