devonfw#5: fixed path normalization on windows

hohwille · Sep 22, 2023 · d1bc8d1 · d1bc8d1
1 parent 338660c
commit d1bc8d1
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/cli/src/main/java/com/devonfw/tools/ide/commandlet/EnvironmentCommandlet.java b/cli/src/main/java/com/devonfw/tools/ide/commandlet/EnvironmentCommandlet.java
@@ -56,23 +56,23 @@ VariableLine normalizeWindowsValue(VariableLine line) {
     String value = line.getValue();
     String normalized = normalizeWindowsValue(value);
     if (normalized != value) {
-      line = line.withValue(value);
+      line = line.withValue(normalized);
     }
     return line;
   }
 
   String normalizeWindowsValue(String value) {
 
     WindowsPathSyntax pathSyntax;
-    WindowsPathSyntax driveSyntax;
     if (this.bash.isTrue()) {
       pathSyntax = WindowsPathSyntax.MSYS;
-      driveSyntax = WindowsPathSyntax.WINDOWS;
     } else {
       pathSyntax = WindowsPathSyntax.WINDOWS;
-      driveSyntax = WindowsPathSyntax.MSYS;
     }
-    String drive = driveSyntax.getDrive(value);
+    String drive = WindowsPathSyntax.WINDOWS.getDrive(value);
+    if (drive == null) {
+      drive = WindowsPathSyntax.MSYS.getDrive(value);
+    }
     if (drive != null) {
       value = pathSyntax.replaceDrive(value, drive);
     }