This is an automated email from the ASF dual-hosted git repository.
mbien pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new 061c748392 use grep -E instead of egrep
new a6f6cc0eb3 Merge pull request #4958 from mbien/grep-minus-e
061c748392 is described below
commit 061c7483926f0b030f782a544644c4354d7d859c
Author: Michael Bien <mbie...@gmail.com>
AuthorDate: Thu Nov 10 21:27:43 2022 +0100
use grep -E instead of egrep
gets rid of this warning:
"egrep: warning: egrep is obsolescent; using grep -E"
---
.../src/org/netbeans/modules/javaee/wildfly/ide/WildflyKiller.java | 4 ++--
platform/o.n.bootstrap/launcher/unix/nbexec | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git
a/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/WildflyKiller.java
b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/WildflyKiller.java
index 63b176ca8a..b22acc4743 100644
---
a/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/WildflyKiller.java
+++
b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/WildflyKiller.java
@@ -72,14 +72,14 @@ public class WildflyKiller {
private boolean killLinux(Runtime rt) {
try {
- String getPidCommand = getJps() + " | egrep -i \"jboss-modules\" |
awk '{ print $1; }'";
+ String getPidCommand = getJps() + " | grep -i \"jboss-modules\" |
awk '{ print $1; }'";
//get a jstack of all the processes
Process process = rt.exec(new String[]{"/bin/sh", "-c",
getPidCommand});
InputStream in = process.getInputStream();
String processTable = readString(in);
readString(process.getErrorStream());
if (!processTable.isEmpty()) {
- readString(rt.exec(new String[]{"/bin/sh", "-c", getJps() + "
| egrep -i \"jboss-modules\" | awk '{ print $1; }' | xargs --no-run-if-empty
kill -9"}).getInputStream());
+ readString(rt.exec(new String[]{"/bin/sh", "-c", getJps() + "
| grep -i \"jboss-modules\" | awk '{ print $1; }' | xargs --no-run-if-empty
kill -9"}).getInputStream());
errorProcessTable = processTable;
}
long end = System.currentTimeMillis() + 5000;
diff --git a/platform/o.n.bootstrap/launcher/unix/nbexec
b/platform/o.n.bootstrap/launcher/unix/nbexec
index ef01e28799..0b5217845a 100755
--- a/platform/o.n.bootstrap/launcher/unix/nbexec
+++ b/platform/o.n.bootstrap/launcher/unix/nbexec
@@ -216,7 +216,7 @@ append_jars_to_cp() {
if [ "`echo "${dir}"/*.$ex`" != "${dir}/*.$ex" ] ; then
for x in "${dir}"/*.$ex ; do
subx=`basename "$x"`
- if [ -z "`echo "$paths" | egrep "$subpath$subx"`" ] ; then
+ if [ -z "`echo "$paths" | grep -E "$subpath$subx"`" ] ; then
if [ ! -z "$cp" ] ; then cp="$cp:" ; fi
cp="$cp$x"
if [ ! -z "$paths" ] ; then paths="$paths:" ; fi
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org
For additional commands, e-mail: commits-h...@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
