OpenJDK / jdk / hs
changeset 22729:ef9f87d39598
8036145: Solaris standard grep does not understand -qE
Reviewed-by: alanb, tbell
| author | erikj |
|---|---|
| date | Tue, 04 Mar 2014 10:22:25 +0100 |
| parents | 0a9d96bf2023 |
| children | c6ac76f2c90c |
| files | common/autoconf/configure |
| diffstat | 1 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/common/autoconf/configure Mon Mar 03 09:21:42 2014 -0800 +++ b/common/autoconf/configure Tue Mar 04 10:22:25 2014 +0100 @@ -127,11 +127,11 @@ if [[ -n "$1" ]]; then # Uses only shell-safe characters? No quoting needed. # '=' is a zsh meta-character, but only in word-initial position. - if echo "$1" | grep -qE '^[ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789.:,%/+=_-]+$' \ - && ! echo "$1" | grep -qE '^='; then + if echo "$1" | grep '^[ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789\.:,%/+=_-]\{1,\}$' > /dev/null \ + && ! echo "$1" | grep '^=' > /dev/null; then quoted="$1" else - if echo "$1" | grep -qE "[\'!]"; then + if echo "$1" | grep "[\'!]" > /dev/null; then # csh does history expansion within single quotes, but not # when backslash-escaped! local quoted_quote="'\\''" quoted_exclam="'\\!'"