Skip to content

Commit ea42a56

Browse files
committed
Don't create /usr/X11R6/bin/xauth but recommend it #7
1 parent 64e43c0 commit ea42a56

File tree

1 file changed

+6
-11
lines changed

1 file changed

+6
-11
lines changed

runx

+6-11
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#! /bin/bash
22
# runx: Provide an X server in Cygwin, MSYS2 or WSL.
33

4-
Version="v0.4.16"
4+
Version="v0.4.17"
55

66
usage() { # Usage information (--help)
77
echo "runx - Run Linux GUI applications on MS Windows.
@@ -509,17 +509,12 @@ setup_cookie() { # Generate X authentication cookie
509509
Xauthbin="${Vcxsrvexe%vcxsrv.exe}xauth.exe"
510510
}
511511

512-
[ -e "$Xauthbin" ] && case "$Winsubsystem" in
513-
MSYS2)
514-
# create xauth wrapper for 'ssh -X' in MSYS2, https://github.com/mviereck/runx/issues/7
515-
[ -e /usr/X11R6/bin/xauth ] || {
516-
mkdir -p /usr/X11R6/bin
517-
echo "#! /bin/bash
512+
# describe xauth wrapper for 'ssh -X' in MSYS2, https://github.com/mviereck/runx/issues/7
513+
[ -e "$Xauthbin" ] && [ "$Winsubsystem" = "MSYS2" ] && [ ! -e /usr/X11R6/bin/xauth ] && note "If you want to use 'ssh -X' in MSYS2, you might need
514+
to create an executeable script /usr/X11R6/bin/xauth with the content:
515+
#! /bin/bash
518516
$(escapestring "$Xauthbin") \"$@\"
519-
" >/usr/X11R6/bin/xauth
520-
}
521-
;;
522-
esac
517+
"
523518

524519
[ -e "$Xauthbin" ] && {
525520
Xauthbin="$(escapestring "$Xauthbin")"

0 commit comments

Comments
 (0)