Attachment 184458 Details for Bug 220668 – Additionally fix `expr` bashism

[patch] Additionally fix `expr` bashism

startx.patch (text/plain), 1.25 KB, created by Duane on 2017-07-18 02:11:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Duane

Created: 2017-07-18 02:11:10 UTC

Size: 1.25 KB

patch

obsolete

>Index: /usr/local/bin/startx
>@@ -125,7 +125,7 @@
> # if no vt is specified add vtarg (which may be empty)
> have_vtarg="no"
> for i in $serverargs; do
>-    if expr match "$i" '^vt[0-9]\+$' > /dev/null; then
>+    if expr "$i" : 'vt[0-9]\+$' > /dev/null; then
>         have_vtarg="yes"
>     fi
> done
>@@ -179,6 +179,7 @@
>     # create a file with auth information for the server. ':0' is a dummy.
>     xserverauthfile=$HOME/.serverauth.$$
>     trap "rm -f '$xserverauthfile'" HUP INT QUIT ILL TRAP KILL BUS TERM
>+    touch "$xserverauthfile"
>     xauth -q -f "$xserverauthfile" << EOF
> add :$dummy . $mcookie
> EOF
>@@ -192,9 +193,9 @@
>     # now add the same credentials to the client authority file
>     # if '$displayname' already exists do not overwrite it as another
>     # server man need it. Add them to the '$xserverauthfile' instead.
>-    for displayname in $authdisplay $hostname$authdisplay; do
>+    for displayname in $authdisplay $hostname/unix$authdisplay; do
>         authcookie=`xauth list "$displayname" \
>-        | sed -n "s/.*$displayname[[:space:]*].*[[:space:]*]//p"` 2>/dev/null;
>+        | sed -n "s|.*$displayname[[:space:]*].*[[:space:]*]||p"` 2>/dev/null;
>         if [ "z${authcookie}" = "z" ] ; then
>             xauth -q << EOF 
> add $displayname . $mcookie

Actions: View | Diff

Attachments on bug 220668: 184314 | 184458 | 184847