diff options
| author | Mark Kettenis <kettenis@openbsd.org> | 2015-01-29 11:23:01 +0100 |
|---|---|---|
| committer | Mark Kettenis <kettenis@openbsd.org> | 2015-01-30 11:35:14 +0100 |
| commit | e3bab0cc706880c22f2b205e7abad9d8c0227071 (patch) | |
| tree | 2091777694cf68d9d4975ce1e350e0844a386bdf | |
| parent | bd6cacdd36615e9b8136aeb86c3924a404785977 (diff) | |
| download | xorg-app-xinit-e3bab0cc706880c22f2b205e7abad9d8c0227071.tar.gz | |
startx: Don't use GNU expr extensions
Use the ':' operator instead of "match" and avoid the use of "\+". Both
constructions aren't specified by POSIX and not supported in BSD expr.
Also drop the '^' from the regular expressions as it is implicit and
POSIX leaves its behaviour undefined.
Signed-off-by: Mark Kettenis <kettenis@openbsd.org>
Acked-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Matthieu Herrb <matthieu@herrb.eu>
| -rw-r--r-- | startx.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -193,7 +193,7 @@ if [ x"$server" = x ]; then XCOMM the startx session being seen as inactive: XCOMM "https://bugzilla.redhat.com/show_bug.cgi?id=806491" tty=$(tty) - if expr match "$tty" '^/dev/tty[0-9]\+$' > /dev/null; then + if expr "$tty" : '/dev/tty[0-9][0-9]*$' > /dev/null; then tty_num=$(echo "$tty" | grep -oE '[0-9]+$') vtarg="vt$tty_num -keeptty" fi @@ -217,7 +217,7 @@ fi XCOMM 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][0-9]*$' > /dev/null; then have_vtarg="yes" fi done |