shebang 'bash -i +H' to make script interactive. #166 #176

mviereck · Aug 7, 2019 · 2621741 · 2621741
1 parent 9cbd3de
commit 2621741
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/x11docker b/x11docker
@@ -1,4 +1,4 @@
-#! /usr/bin/env bash
+#! /usr/bin/env -S bash -i +H
 
 # x11docker
 # Run GUI applications and desktop environments in docker
@@ -2331,10 +2331,9 @@ check_vt() {                    # option --xorg: find free vt / tty
   local Line= Ttyinuse=
 
   # if started from console, use current tty
-  [ "$Hosttty" = "yes" ] && {
+  tty -s && [ "$Hosttty" = "yes" ] && {
     Newxvt="$(tty | rev | cut -d/ -f1 | rev)"
     Newxvt="${Newxvt#tty}"
-    isnum "$Newxvt" || Newxvt=""
   }
 
   # check ttys currently in use
@@ -5518,9 +5517,10 @@ check_host() {                  # check host environment
   }
 
   # Check whether x11docker runs on X or on tty
-  tty | grep -q tty     && Hosttty="yes" || Hosttty="no"
-  tty >/dev/null        || Hosttty="unkown"
-  [ "$Winsubsystem"   ] && Hosttty="no"
+  tty | grep -q tty                         && Hosttty="yes" || Hosttty="no"
+  tty -s                                    || Hosttty="unkown"
+  [ -n "${DISPLAY:-}${WAYLAND_DISPLAY:-}" ] && Hosttty="no"
+  [ "$Winsubsystem"   ]                     && Hosttty="no"
   XDG_VTNR=${XDG_VTNR:-}
 
   # Check whether x11docker runs in an interactive terminal