fixed parsing error with multiple -- (#58)

mviereck · Jul 30, 2018 · 57474fa · 57474fa
1 parent a100ac9
commit 57474fa
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/x11docker b/x11docker
@@ -1775,7 +1775,8 @@ $Customenvironment"    ;  shift ;;                         # set custom environm
       --) shift
         [ "$(cut -c1 <<< "${1:-}")"  = "-" ] && grep -q " -- "  <<< "$*" && {
           Customdockeroptions="$(sed 's/ -- .*//' <<< "$*" )"
-          Imagecommand="$(sed -n 's/^.* -- //p' <<< "$*" )"
+          Line="$*"
+          Imagecommand="${Line#$Customdockeroptions -- }"
           Imagename="$(cut -d ' ' -f1 <<< "$Imagecommand")"
           Imagecommand="$(cut -d ' ' -f2- -s <<< "$Imagecommand")"
           break
@@ -6062,7 +6063,7 @@ $(tail $Compositorlogfile)"
     --vcxsrv)
       Tasklistold="
 $(tasklist.exe | rmcr | grep vcxsrv.exe | awk '{print $2}')"
-      $Mksu "exec                                                              $Xcommand          2>&1 | rmcr >> $Xinitlogfile &"
+      $Mksu "exec env MSYS2_ARG_CONV_EXCL='*'                                  $Xcommand          2>&1 | rmcr >> $Xinitlogfile &"
       case $Winsubsystem in
         MSYS|CYGWIN)
           Tasklistnew="$Tasklistold