Merge pull request #847 from mchf/replaced_egrep

Replaced egrep with grep -E
yast · Sep 9, 2022 · 48f133e · 48f133e
2 parents ec5b643 + 6267f73
commit 48f133e
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 5 deletions.
diff --git a/package/autoyast2.changes b/package/autoyast2.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Sep  9 08:29:55 UTC 2022 - Michal Filka <mfilka@suse.com>
+
+- bsc#1203227
+  - Replaced egrep with grep -E.
+- 4.5.4
+
 -------------------------------------------------------------------
 Fri Jul 22 11:31:20 UTC 2022 - Knut Anderssen <kanderssen@suse.com>
 

diff --git a/package/autoyast2.spec b/package/autoyast2.spec
@@ -22,7 +22,7 @@
 %endif
 
 Name:           autoyast2
-Version:        4.5.3
+Version:        4.5.4
 Release:        0
 Summary:        YaST2 - Automated Installation
 License:        GPL-2.0-only

diff --git a/test_xml/cc.xml b/test_xml/cc.xml
@@ -122,9 +122,9 @@
 
 LOC="/tmp/cc-package-uri"
 
-$(echo "$VAL" | egrep -q "^http://") || \
-$(echo "$VAL" | egrep -q "^ftp://") || \
-$(echo "$VAL" | egrep -q "^file:///") && \
+$(echo "$VAL" | grep -q "^http://") || \
+$(echo "$VAL" | grep -q "^ftp://") || \
+$(echo "$VAL" | grep -q "^file:///") && \
 {
         echo "$VAL" > $LOC
         exit 0

diff --git a/test_xml/cobbler.xml b/test_xml/cobbler.xml
@@ -951,7 +951,7 @@ echo "jo" > /tmp/post-run
           <source><![CDATA[
 #!/bin/sh
 
-if echo "$VAL" | egrep '^[1-9][0-9]{0,3}$' > /dev/null; then
+if echo "$VAL" | grep -E '^[1-9][0-9]{0,3}$' > /dev/null; then
     sed -e "s/%NODE%/${VAL}/g" /tmp/profile/autoinst.xml > /tmp/profile/modified.xml
     echo "Completed editing profile as node number $VAL."
     exit 0