Skip to content

Commit 7cfdb32

Browse files
authored
replace egrep with grep -E (#3652)
1 parent 9df711f commit 7cfdb32

File tree

8 files changed

+14
-9
lines changed

8 files changed

+14
-9
lines changed

integration-tests/src/test/resources/bash-scripts/discover_domain.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ run_wdt() {
164164
local domain_home_dir="/u01/$domain_src"
165165
if [ -z "${domain_home_dir}" ]; then
166166
local domain_dir="/shared/domains"
167-
local domain_uid=`egrep 'domainUID' $inputs_orig | awk '{print $2}'`
167+
local domain_uid=`grep -E 'domainUID' $inputs_orig | awk '{print $2}'`
168168
local domain_home_dir=$domain_dir/$domain_uid
169169
fi
170170

integration-tests/src/test/resources/bash-scripts/setup_wdt.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ run_wdt() {
187187
local domain_home_dir="$DOMAIN_HOME_DIR"
188188
if [ -z "${domain_home_dir}" ]; then
189189
local domain_dir="/shared/domains"
190-
local domain_uid=`egrep 'domainUID' $inputs_orig | awk '{print $2}'`
190+
local domain_uid=`grep -E 'domainUID' $inputs_orig | awk '{print $2}'`
191191
local domain_home_dir=$domain_dir/$domain_uid
192192
fi
193193

integration-tests/src/test/resources/bash-scripts/syncTestImagesRepo.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ dockerPullPushImage() {
4949

5050
dockerPullPushImages() {
5151
file="images.properties"
52-
egrep -v '^#' $file | grep -v "^$" |
52+
grep -E -v '^#' $file | grep -v "^$" |
5353
while IFS=";" read -r f1 f2
5454
do
5555
# printf 'Source Location : [%s], Target: [%s] \n' "$f1" "$f2"

kubernetes/samples/scripts/common/wdt-and-wit-utility.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ run_wdt() {
138138
local domain_home_dir="$DOMAIN_HOME_DIR"
139139
if [ -z "${domain_home_dir}" ]; then
140140
local domain_dir="/shared/domains"
141-
local domain_uid=`egrep 'domainUID' $inputs_orig | awk '{print $2}'`
141+
local domain_uid=`grep -E 'domainUID' $inputs_orig | awk '{print $2}'`
142142
local domain_home_dir=$domain_dir/$domain_uid
143143
fi
144144

kubernetes/samples/scripts/delete-domain/delete-weblogic-domain-resources.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ getDomainResources() {
9797
if [ $? -eq 0 ]; then
9898
kubectl get domain \
9999
-o=jsonpath='{range .items[*]}{.kind}{" "}{.metadata.name}{" -n "}{.metadata.namespace}{"\n"}{end}' \
100-
--all-namespaces=true | egrep "$domain_regex" >> $2
100+
--all-namespaces=true | grep -E "$domain_regex" >> $2
101101
fi
102102

103103
# now, get all non-namespaced types with -l $LABEL_SELECTOR

operator/integration-tests/bash/cleanup.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -483,7 +483,7 @@ genericDelete() {
483483
kubectl get pvc \
484484
-o=jsonpath='{range .items[*]}{.metadata.name}{" -n "}{.metadata.namespace}{"\n"}{end}' \
485485
--all-namespaces=true \
486-
| egrep -e "($3)" | patchPVCFinalizer
486+
| grep -E -e "($3)" | patchPVCFinalizer
487487
fi
488488

489489
while : ; do
@@ -494,14 +494,14 @@ genericDelete() {
494494
kubectl get $1 \
495495
-o=jsonpath='{range .items[*]}{.metadata.namespace}{" "}{.kind}{"/"}{.metadata.name}{"\n"}{end}' \
496496
--all-namespaces=true 2>&1 \
497-
| egrep -e "($3)" | sort > $resfile_yes 2>&1
497+
| grep -E -e "($3)" | sort > $resfile_yes 2>&1
498498
artcount_yes="`cat $resfile_yes | wc -l`"
499499

500500
# leftover non-namespaced artifacts
501501
kubectl get $2 \
502502
-o=jsonpath='{range .items[*]}{.kind}{"/"}{.metadata.name}{"\n"}{end}' \
503503
--all-namespaces=true 2>&1 \
504-
| egrep -e "($3)" | sort > $resfile_no 2>&1
504+
| grep -E -e "($3)" | sort > $resfile_no 2>&1
505505
artcount_no="`cat $resfile_no | wc -l`"
506506

507507
artcount_total=$((artcount_yes + artcount_no))

operator/integration-tests/introspector/introspectTest.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -603,7 +603,7 @@ waitForPod() {
603603
fi
604604
echo -n "."
605605
sleep 1
606-
status=`kubectl -n $NAMESPACE get pods 2>&1 | egrep $pod_name | awk '{print $2}'`
606+
status=`kubectl -n $NAMESPACE get pods 2>&1 | grep -E $pod_name | awk '{print $2}'`
607607
done
608608
echo " ($((SECONDS - startsecs)) seconds)"
609609
}

validateScripts.sh

+5
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,11 @@ validate_script() {
1515
if [ -n "$result" ]; then
1616
printf "Please remove usages of 'function' keyword from %s:\n%s\n" "$1" "$result"
1717
fi
18+
19+
result=$(grep "egrep" "$1")
20+
if [ -n "$result" ]; then
21+
printf "Please replace usages of 'egrep' with 'grep -E' in %s:\n%s\n" "$1" "$result"
22+
fi
1823
}
1924

2025

0 commit comments

Comments
 (0)