diff options
author | CoprDistGit <copr-devel@lists.fedorahosted.org> | 2023-03-02 03:09:49 +0000 |
---|---|---|
committer | CoprDistGit <copr-devel@lists.fedorahosted.org> | 2023-03-02 03:09:49 +0000 |
commit | 9af72b1f31ee233b46aa59a5ba6da4f673a8efa1 (patch) | |
tree | ff30711e8596b2e6cfe1c176884f48abd4a0a948 /zsh-5.9-fix-egrep-test-error.patch | |
parent | 919409ac45333a832dc566a92dbfd7bf21be84ba (diff) |
automatic import of zshopeneuler20.03
Diffstat (limited to 'zsh-5.9-fix-egrep-test-error.patch')
-rw-r--r-- | zsh-5.9-fix-egrep-test-error.patch | 72 |
1 files changed, 72 insertions, 0 deletions
diff --git a/zsh-5.9-fix-egrep-test-error.patch b/zsh-5.9-fix-egrep-test-error.patch new file mode 100644 index 0000000..3d3c1d3 --- /dev/null +++ b/zsh-5.9-fix-egrep-test-error.patch @@ -0,0 +1,72 @@ +diff -Naur a/Test/D07multibyte.ztst b/Test/D07multibyte.ztst +--- a/Test/D07multibyte.ztst 2022-05-08 14:18:22.000000000 +0800 ++++ b/Test/D07multibyte.ztst 2023-01-30 16:26:37.480018635 +0800 +@@ -6,7 +6,7 @@ + unset -m LC_\* + mb_ok= + langs=(en_{US,GB}.{UTF-,utf}8 en.UTF-8 +- $(locale -a 2>/dev/null | egrep 'utf8|UTF-8')) ++ $(locale -a 2>/dev/null | grep -E 'utf8|UTF-8')) + for LANG in $langs; do + if [[ é = ? ]]; then + mb_ok=1 +diff -Naur a/Test/E01options.ztst b/Test/E01options.ztst +--- a/Test/E01options.ztst 2022-05-08 14:18:22.000000000 +0800 ++++ b/Test/E01options.ztst 2023-01-30 16:26:37.481018640 +0800 +@@ -651,7 +651,7 @@ + >noktarg1 + >0 1 + +- showopt() { setopt | egrep 'localoptions|ksharrays'; } ++ showopt() { setopt | grep -E 'localoptions|ksharrays'; } + f1() { setopt localoptions ksharrays; showopt } + f2() { setopt ksharrays; showopt } + setopt kshoptionprint +diff -Naur a/Test/V07pcre.ztst b/Test/V07pcre.ztst +--- a/Test/V07pcre.ztst 2022-05-08 14:18:22.000000000 +0800 ++++ b/Test/V07pcre.ztst 2023-01-30 16:26:37.488018676 +0800 +@@ -12,7 +12,7 @@ + unset -m LC_\* + mb_ok= + langs=(en_{US,GB}.{UTF-,utf}8 en.UTF-8 +- $(locale -a 2>/dev/null | egrep 'utf8|UTF-8')) ++ $(locale -a 2>/dev/null | grep -E 'utf8|UTF-8')) + for LANG in $langs; do + if [[ é = ? ]]; then + mb_ok=1 +diff -Naur a/Test/X02zlevi.ztst b/Test/X02zlevi.ztst +--- a/Test/X02zlevi.ztst 2022-05-08 14:18:22.000000000 +0800 ++++ b/Test/X02zlevi.ztst 2023-01-30 16:26:37.492018696 +0800 +@@ -4,7 +4,7 @@ + unset -m LC_\* + ZSH_TEST_LANG= + langs=(en_{US,GB}.{UTF-,utf}8 en.UTF-8 +- $(locale -a 2>/dev/null | egrep 'utf8|UTF-8')) ++ $(locale -a 2>/dev/null | grep -E 'utf8|UTF-8')) + for LANG in $langs; do + if [[ é = ? ]]; then + ZSH_TEST_LANG=$LANG +diff -Naur a/Test/X03zlebindkey.ztst b/Test/X03zlebindkey.ztst +--- a/Test/X03zlebindkey.ztst 2022-05-08 14:18:22.000000000 +0800 ++++ b/Test/X03zlebindkey.ztst 2023-01-30 16:26:37.492018696 +0800 +@@ -6,7 +6,7 @@ + unset -m LC_\* + ZSH_TEST_LANG= + langs=(en_{US,GB}.{UTF-,utf}8 en.UTF-8 +- $(locale -a 2>/dev/null | egrep 'utf8|UTF-8')) ++ $(locale -a 2>/dev/null | grep -E 'utf8|UTF-8')) + for LANG in $langs; do + if [[ é = ? ]]; then + ZSH_TEST_LANG=$LANG +diff -Naur a/Test/Y01completion.ztst b/Test/Y01completion.ztst +--- a/Test/Y01completion.ztst 2022-05-08 14:18:22.000000000 +0800 ++++ b/Test/Y01completion.ztst 2023-01-30 16:26:37.493018701 +0800 +@@ -4,7 +4,7 @@ + unset -m LC_\* + ZSH_TEST_LANG= + langs=(en_{US,GB}.{UTF-,utf}8 en.UTF-8 +- $(locale -a 2>/dev/null | egrep 'utf8|UTF-8')) ++ $(locale -a 2>/dev/null | grep -E 'utf8|UTF-8')) + for LANG in $langs; do + if [[ é = ? ]]; then + ZSH_TEST_LANG=$LANG |