From 85dafde586d5540dd4b5e8dac8eb79c3fcb1e37f Mon Sep 17 00:00:00 2001 From: Stephan Schwär Date: Thu, 22 Oct 2020 17:31:17 +0900 Subject: [client] Set standard path of ovftool in windows --- .../openslx/dozmod/gui/wizard/page/ImageOvfConversionPage.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageOvfConversionPage.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageOvfConversionPage.java index dbe2a6bc..97319a54 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageOvfConversionPage.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageOvfConversionPage.java @@ -37,7 +37,7 @@ public class ImageOvfConversionPage extends ImageOvfConversionPageLayout { private ConversionTaskWorker worker; private String startConversionButtonString = "Konvertierung starten"; public boolean danglingConversion = false; - private String ovfToolPath = "ovftooll"; + private String ovfToolPath = "ovftool"; public ImageOvfConversionPage(Wizard wizard, UploadWizardState uploadWizardState) { super(wizard); @@ -45,6 +45,12 @@ public class ImageOvfConversionPage extends ImageOvfConversionPageLayout { this.canComeBack = false; this.state = uploadWizardState; page = this; + String os = System.getProperty("os.name"); + if (os.toLowerCase().contains("windows")) { + ovfToolPath = "C:\\Program Files (x86)\\VMware\\VMware Player\\OVFTool\\ovftool.exe"; + } else if (os.toLowerCase().contains("mac")) { + ovfToolPath = "/Applications/VMware Fusion.app/Contents/Library/VMware OVF Tool"; + } txtInfoText.setVisible(true); -- cgit v1.2.3-55-g7522