Skip to content

Commit 7351215

Browse files
committed
Replace deprecated egrep with "grep -E"
1 parent 0903604 commit 7351215

File tree

7 files changed

+13
-13
lines changed

7 files changed

+13
-13
lines changed

builds/install/arch-specific/aix/misc/aixLibrary.sh.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ getInitScriptLocation() {
8585
# stop super server if it is running
8686

8787
stopSuperServerIfRunning() {
88-
checkString=`ps -eaf | egrep "\b(fbserver|fbguard)\b" |grep -v grep`
88+
checkString=`ps -eaf | grep -E "\b(fbserver|fbguard)\b" |grep -v grep`
8989

9090
if [ ! -z "$checkString" ]
9191
then

builds/install/arch-specific/freebsd/freebsdLibrary.sh.in

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ getInitScriptLocation() {
107107
# stop super server if it is running
108108

109109
stopSuperServerIfRunning() {
110-
checkString=`ps -af | egrep "\b(fbserver|fbguard|fb_smp_server)\b" |grep -v grep`
110+
checkString=`ps -af | grep -E "\b(fbserver|fbguard|fb_smp_server)\b" |grep -v grep`
111111

112112
if [ ! -z "$checkString" ]
113113
then
@@ -120,7 +120,7 @@ stopSuperServerIfRunning() {
120120
do
121121
$init_d stop
122122
sleep 1
123-
checkString=`ps -eaf | egrep "\b(fbserver|fbguard|fb_smp_server)\b" |grep -v grep`
123+
checkString=`ps -eaf | grep -E "\b(fbserver|fbguard|fb_smp_server)\b" |grep -v grep`
124124
if [ -z "$checkString" ]
125125
then
126126
return
@@ -211,7 +211,7 @@ startService() {
211211
then
212212
"$InitFile" start
213213

214-
checkString=`ps -af | egrep "\b(fbserver|fb_smp_server)\b" |grep -v grep`
214+
checkString=`ps -af | grep -E "\b(fbserver|fb_smp_server)\b" |grep -v grep`
215215
if [ -z "$checkString" ]
216216
then
217217
# server didn't start - possible reason bad shell /bin/false for user "firebird"

builds/install/arch-specific/hpux/misc/hpuxLibrary.sh.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ getInitScriptLocation() {
7979
# stop super server if it is running
8080

8181
stopSuperServerIfRunning() {
82-
checkString=`ps -eaf | egrep "\b(fbserver|fbguard)\b" |grep -v grep`
82+
checkString=`ps -eaf | grep -E "\b(fbserver|fbguard)\b" |grep -v grep`
8383

8484
if [ ! -z "$checkString" ]
8585
then

builds/install/arch-specific/hpux/super/preInstall.sh.in

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
stopServerIfRunning() {
2323

24-
checkString=`ps -ef | egrep "(fbserver|fbguard)" |grep -v grep`
24+
checkString=`ps -ef | grep -E "(fbserver|fbguard)" |grep -v grep`
2525

2626
if [ ! -z "$checkString" ]
2727
then
@@ -42,7 +42,7 @@
4242
stopServerIfRunning
4343

4444

45-
checkString=`ps -ef | egrep "(fbserver|fbguard)" |grep -v grep`
45+
checkString=`ps -ef | grep -E "(fbserver|fbguard)" |grep -v grep`
4646

4747
if [ ! -z "$checkString" ]
4848
then
@@ -54,7 +54,7 @@
5454

5555

5656

57-
checkString=`ps -ef | egrep "(fb_inet_server|fb_smp_server)" |grep -v grep`
57+
checkString=`ps -ef | grep -E "(fb_inet_server|fb_smp_server)" |grep -v grep`
5858

5959
if [ ! -z "$checkString" ]
6060
then
@@ -67,7 +67,7 @@
6767

6868
# Stop lock manager if it is the only thing running.
6969

70-
for i in `ps -ef | egrep "fb_lock_mgr" | awk '{print $2}' `
70+
for i in `ps -ef | grep -E "fb_lock_mgr" | awk '{print $2}' `
7171
do
7272
kill $i
7373
done

builds/install/arch-specific/hpux/super/preUninstall.sh.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66

77
stopServerIfRunning() {
8-
checkString=`ps -ef | egrep "(fbserver|fbguard)" |grep -v grep`
8+
checkString=`ps -ef | grep -E "(fbserver|fbguard)" |grep -v grep`
99

1010
if [ ! -z "$checkString" ]
1111
then
@@ -16,7 +16,7 @@ stopServerIfRunning() {
1616
fi
1717
fi
1818

19-
checkString=`ps -ef | egrep "(fbserver|fbguard)" |grep -v grep`
19+
checkString=`ps -ef | grep -E "(fbserver|fbguard)" |grep -v grep`
2020
if [ ! -z "$checkString" ]
2121
then
2222
# careful shutdown of server failed :)

builds/install/arch-specific/linux/makeInstallImage.sh.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ addLibs() {
6161
[ "$LIB" ] && echo "export LIBTOMMATH=$LIB" >>$libTarget
6262
LIB=`$OBJDUMP -p $libSdir/firebird|grep NEEDED|grep tomcrypt|awk '{print $2;}'`
6363
[ "$LIB" ] && echo "export LIBTOMCRYPT=$LIB" >>$libTarget
64-
LIB=$(echo `$OBJDUMP -p $libSdir/isql|grep NEEDED|egrep "(curses|termcap|tinfo)"|awk '{print $2;}'`)
64+
LIB=$(echo `$OBJDUMP -p $libSdir/isql|grep NEEDED|grep -E "(curses|termcap|tinfo)"|awk '{print $2;}'`)
6565
[ "$LIB" ] && echo "export LIBCURSES='$LIB'" >>$libTarget
6666
echo >>$libTarget
6767

builds/install/posix-common/posixLibrary.sh.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ checkLibraries() {
249249
grepProcess() {
250250
processList=$1
251251
eol=\$
252-
ps $psOptions | egrep "\<($processList)($eol|[[:space:]])" | grep -v grep | grep -v -w '\-path'
252+
ps $psOptions | grep -E "\<($processList)($eol|[[:space:]])" | grep -v grep | grep -v -w '\-path'
253253
}
254254

255255

0 commit comments

Comments
 (0)