From e3bab0cc706880c22f2b205e7abad9d8c0227071 Mon Sep 17 00:00:00 2001 From: Mark Kettenis Date: Thu, 29 Jan 2015 11:23:01 +0100 Subject: 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 Acked-by: Hans de Goede Reviewed-by: Matthieu Herrb --- startx.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/startx.cpp b/startx.cpp index 45d7bd9..ce4713f 100644 --- a/startx.cpp +++ b/startx.cpp @@ -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 -- cgit v1.2.3