File tree 8 files changed +14
-9
lines changed
integration-tests/src/test/resources/bash-scripts
kubernetes/samples/scripts
operator/integration-tests
8 files changed +14
-9
lines changed Original file line number Diff line number Diff line change @@ -164,7 +164,7 @@ run_wdt() {
164
164
local domain_home_dir=" /u01/$domain_src "
165
165
if [ -z " ${domain_home_dir} " ]; then
166
166
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}' `
168
168
local domain_home_dir=$domain_dir /$domain_uid
169
169
fi
170
170
Original file line number Diff line number Diff line change @@ -187,7 +187,7 @@ run_wdt() {
187
187
local domain_home_dir=" $DOMAIN_HOME_DIR "
188
188
if [ -z " ${domain_home_dir} " ]; then
189
189
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}' `
191
191
local domain_home_dir=$domain_dir /$domain_uid
192
192
fi
193
193
Original file line number Diff line number Diff line change @@ -49,7 +49,7 @@ dockerPullPushImage() {
49
49
50
50
dockerPullPushImages () {
51
51
file=" images.properties"
52
- egrep -v ' ^#' $file | grep -v " ^$" |
52
+ grep -E -v ' ^#' $file | grep -v " ^$" |
53
53
while IFS=" ;" read -r f1 f2
54
54
do
55
55
# printf 'Source Location : [%s], Target: [%s] \n' "$f1" "$f2"
Original file line number Diff line number Diff line change @@ -138,7 +138,7 @@ run_wdt() {
138
138
local domain_home_dir=" $DOMAIN_HOME_DIR "
139
139
if [ -z " ${domain_home_dir} " ]; then
140
140
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}' `
142
142
local domain_home_dir=$domain_dir /$domain_uid
143
143
fi
144
144
Original file line number Diff line number Diff line change @@ -97,7 +97,7 @@ getDomainResources() {
97
97
if [ $? -eq 0 ]; then
98
98
kubectl get domain \
99
99
-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
101
101
fi
102
102
103
103
# now, get all non-namespaced types with -l $LABEL_SELECTOR
Original file line number Diff line number Diff line change @@ -483,7 +483,7 @@ genericDelete() {
483
483
kubectl get pvc \
484
484
-o=jsonpath=' {range .items[*]}{.metadata.name}{" -n "}{.metadata.namespace}{"\n"}{end}' \
485
485
--all-namespaces=true \
486
- | egrep -e " ($3 )" | patchPVCFinalizer
486
+ | grep -E -e " ($3 )" | patchPVCFinalizer
487
487
fi
488
488
489
489
while : ; do
@@ -494,14 +494,14 @@ genericDelete() {
494
494
kubectl get $1 \
495
495
-o=jsonpath=' {range .items[*]}{.metadata.namespace}{" "}{.kind}{"/"}{.metadata.name}{"\n"}{end}' \
496
496
--all-namespaces=true 2>&1 \
497
- | egrep -e " ($3 )" | sort > $resfile_yes 2>&1
497
+ | grep -E -e " ($3 )" | sort > $resfile_yes 2>&1
498
498
artcount_yes=" ` cat $resfile_yes | wc -l` "
499
499
500
500
# leftover non-namespaced artifacts
501
501
kubectl get $2 \
502
502
-o=jsonpath=' {range .items[*]}{.kind}{"/"}{.metadata.name}{"\n"}{end}' \
503
503
--all-namespaces=true 2>&1 \
504
- | egrep -e " ($3 )" | sort > $resfile_no 2>&1
504
+ | grep -E -e " ($3 )" | sort > $resfile_no 2>&1
505
505
artcount_no=" ` cat $resfile_no | wc -l` "
506
506
507
507
artcount_total=$(( artcount_yes + artcount_no))
Original file line number Diff line number Diff line change @@ -603,7 +603,7 @@ waitForPod() {
603
603
fi
604
604
echo -n " ."
605
605
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}' `
607
607
done
608
608
echo " ($(( SECONDS - startsecs)) seconds)"
609
609
}
Original file line number Diff line number Diff line change @@ -15,6 +15,11 @@ validate_script() {
15
15
if [ -n " $result " ]; then
16
16
printf " Please remove usages of 'function' keyword from %s:\n%s\n" " $1 " " $result "
17
17
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
18
23
}
19
24
20
25
You can’t perform that action at this time.
0 commit comments