MS Windows: avoid // in path #225

mviereck · Feb 19, 2020 · 19ab2ef · 19ab2ef
1 parent e05a04a
commit 19ab2ef
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/x11docker b/x11docker
@@ -6082,7 +6082,6 @@ check_host() {                  # check host environment
   case $Winsubsystem in
     MSYS2|CYGWIN) 
       Winsubmount="$(cygpath.exe -u "c:/" | rmcr | sed s%/c/%%)"
-      Winsubmount="${Winsubmount%/}"
       Winsubpath="$(convertpath unix "$(cygpath.exe -w "/" | rmcr)" )"
       Mobyvm="yes"
     ;;
@@ -6098,6 +6097,8 @@ check_host() {                  # check host environment
       Winsubpath="$(convertpath unix "$(getwslpath)")" 
     ;;
   esac
+  Winsubmount="${Winsubmount%/}"
+  Winsubpath="${Winsubpath%/}"
   [ "$Winsubsystem" ] && Hostsystem="MSWindows-$Winsubsystem"
 
   [ -z "$Mobyvm" ] && Mobyvm="no"  
@@ -8368,7 +8369,7 @@ Parsed options:    $Parsedoptions_global"
   bash \$-:                                        $-"
   [ "$Winsubsystem" ] && debugnote "
   Running on Windows subsystem:                   $Winsubsystem
-  Path to subsystem:                              $(convertpath windows $Winsubpath)
+  Path to subsystem:                              $(convertpath windows $Winsubpath)/
   Mount path in subsystem:                        $Winsubmount/
   Using MobyVM:                                   $Mobyvm"