Skip to content

Commit 46111d9

Browse files
committed
avoid Xauthbin=convertpath() #7
1 parent ea42a56 commit 46111d9

File tree

1 file changed

+5
-6
lines changed

1 file changed

+5
-6
lines changed

runx

Lines changed: 5 additions & 6 deletions
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.17"
4+
Version="v0.4.18"
55

66
usage() { # Usage information (--help)
77
echo "runx - Run Linux GUI applications on MS Windows.
@@ -517,14 +517,13 @@ $(escapestring "$Xauthbin") \"$@\"
517517
"
518518

519519
[ -e "$Xauthbin" ] && {
520-
Xauthbin="$(escapestring "$Xauthbin")"
521520
grep -q "/usr/bin" <<< "$Xauthbin" && Xauthsystem="subsystem" || Xauthsystem="windows"
522521
# generate fresh cookie
523-
$Xauthbin -i -f "$(convertpath $Xauthsystem "$Xcookie")" add :$Newdisplaynumber . $(mcookie)
522+
"$Xauthbin" -i -f "$(convertpath $Xauthsystem "$Xcookie")" add :$Newdisplaynumber . $(mcookie)
524523
# prepare cookie with localhost identification disabled by ffff. ffff means 'familiy wild'
525-
Cookie="$($Xauthbin -i -f "$(convertpath $Xauthsystem "$Xcookie")" nlist | sed -e 's/^..../ffff/')"
526-
printf "$Cookie" | $Xauthbin -i -f "$(convertpath $Xauthsystem "$Xcookie")" nmerge -
527-
verbose "Cookie: $($Xauthbin -v -f "$(convertpath $Xauthsystem "$Xcookie")" list)"
524+
Cookie="$("$Xauthbin" -i -f "$(convertpath $Xauthsystem "$Xcookie")" nlist | sed -e 's/^..../ffff/')"
525+
printf "$Cookie" | "$Xauthbin" -i -f "$(convertpath $Xauthsystem "$Xcookie")" nmerge -
526+
verbose "Cookie: $("$Xauthbin" -v -f "$(convertpath $Xauthsystem "$Xcookie")" list)"
528527
} || {
529528
note "Command xauth not found.
530529
runx will try experimental code to bake an X cookie itself.

0 commit comments

Comments
 (0)