-v: fix parsing (no optional argument)

mviereck · May 7, 2022 · bee1ad1 · bee1ad1
1 parent 64466a8
commit bee1ad1
Showing 1 changed file with 11 additions and 9 deletions.
diff --git a/x11docker b/x11docker
@@ -11,7 +11,7 @@
 # Run 'x11docker --help' or scroll down to read usage information.
 # More documentation at:  https://github.com/mviereck/x11docker
 
-Version="7.1.5-beta-8"
+Version="7.1.5-beta-9"
 
 # --enforce-i: Enforce running in interactive mode to allow commands tty and weston-launch in special setups.
 grep -q -- "--enforce-i" <<< "$*" && case $- in
@@ -7223,6 +7223,7 @@ start_container() {             # docker run
     no)
       case "$Backend" in
         host)
+          #echo $Hostuser $Containeruser $Containeruserhome $Cachefolder
           bash "$Containerrc" & Pid1pid=$!
         ;;
         proot|chroot)
@@ -8526,14 +8527,15 @@ ${2:-}"                       ; shift ;;                             # Add custo
          --cachebasedir)      Cachebasefolder="${2:-}" ; shift ;;    # Set base folder for cache  instead of ~/.cache/x11docker
 
      #### Verbosity options
-      -D|--debug)             Debugmode="yes" ;;                     # Debugging mode
-      -v|--verbose)           Verbose="${2:-yes}" ; shift ;;                 # Be verbose
-      -V)                     Verbose="${Verbose:-yes}"; Verbosecolors="yes";;   # Be verbose with colored output
-      -q|--quiet)             Silent="yes" ;;                        # Do not show warnings or errors
-         --printenv)          Showdisplayenvironment="${2:-yes}" ; shift ;;  # Output of display number and cookie file on stdout. Catch with: read xenv < <(x11docker --printenv)
-         --printid)           Showcontainerid="${2:-yes}" ; shift ;;         # Output of container id on stdout
-         --printinfofile)     Showinfofile="${2:-yes}" ; shift ;;            # Show path to $Storeinfofile
-         --printpid1)         Showcontainerpid1pid="${2:-yes}" ; shift ;;    # Output of host PID of container PID 1
+      -D|--debug)             Debugmode="yes" ;;                                # Debugging mode
+      -v)                     Verbose="yes" ;;                                  # Be verbose
+         --verbose)           Verbose="${2:-yes}" ; shift ;;                    # Be verbose
+      -V)                     Verbose="${Verbose:-yes}"; Verbosecolors="yes";;  # Be verbose with colored output
+      -q|--quiet)             Silent="yes" ;;                                   # Do not show warnings or errors
+         --printenv)          Showdisplayenvironment="${2:-yes}" ; shift ;;     # Output of display number and cookie file on stdout. Catch with: read xenv < <(x11docker --printenv)
+         --printid)           Showcontainerid="${2:-yes}" ; shift ;;            # Output of container id on stdout
+         --printinfofile)     Showinfofile="${2:-yes}" ; shift ;;               # Show path to $Storeinfofile
+         --printpid1)         Showcontainerpid1pid="${2:-yes}" ; shift ;;       # Output of host PID of container PID 1
 
      #### Special options not starting X or docker
          --build)             Buildimage="yes" ;;                    # Build an image from x11docker repository