xtool(): fix X container check

mviereck · Jan 16, 2023 · 850cfbe · 850cfbe
1 parent 789e751
commit 850cfbe
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/x11docker b/x11docker
@@ -5354,7 +5354,7 @@ xtool() {                       # run X tool command in X container if available
       Usexcontainer="no"
     ;;
   esac
-  [ "$Check" = "no" ] && Usexcontainer="yes"
+  [ "$Check" = "no" ] && Usexcontainer="${Usexcontainer:-yes}"
   Usexcontainer="${Usexcontainer:-no}" # in case xinitrc already runs in X container.
   verbose "xtool(): (use xc $Usexcontainer): ${1:-}"
   case "$Usexcontainer" in
@@ -9911,7 +9911,7 @@ check_options_interferences() { # check multiple option interferences, change se
 
   # Check whether host X server has MIT-SHM enabled.
   [ "$Winsubsystem" ] && Hostmitshm="no" || {
-    xtool --nocheck "env LD_PRELOAD= xdpyinfo 2>>$Xinitlogfile | grep -q 'MIT-SHM'" && Hostmitshm="yes" || Hostmitshm="no"
+    xtool --nocheck "env LD_PRELOAD= xdpyinfo 2>>$Xinitlogfile | grep -q MIT-SHM" && Hostmitshm="yes" || Hostmitshm="no"
     xtool --check --quiet xdpyinfo || Hostmitshm="yes" # if unknown, assume yes
   }