projects
/
feisty_meow.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
e209074
)
still fixing this. nearly there.
author
Chris Koeritz
<fred@gruntose.com>
Fri, 7 Mar 2014 18:39:47 +0000
(13:39 -0500)
committer
Chris Koeritz
<fred@gruntose.com>
Fri, 7 Mar 2014 18:39:47 +0000
(13:39 -0500)
scripts/core/functions.sh
patch
|
blob
|
history
diff --git
a/scripts/core/functions.sh
b/scripts/core/functions.sh
index a9c5dd660312c1d42fc9b020a54630ee245d2634..286d6f5c7effc8722660b582548fd533c5be0ae9 100644
(file)
--- a/
scripts/core/functions.sh
+++ b/
scripts/core/functions.sh
@@
-104,16
+104,11
@@
if [ -z "$skip_all" ]; then
local CR='
' # embedded carriage return.
local appropriate_pattern="s/^.* *\([0-9][0-9]*\)[ $CR]*\$/\1/p"
local CR='
' # embedded carriage return.
local appropriate_pattern="s/^.* *\([0-9][0-9]*\)[ $CR]*\$/\1/p"
+ local -a PIDS_SOUGHT
for i in "${patterns[@]}"; do
for i in "${patterns[@]}"; do
-
local -a
PIDS_SOUGHT+=($(cat $PID_DUMP \
+ PIDS_SOUGHT+=($(cat $PID_DUMP \
| grep -i "$i" \
| sed -n -e "$appropriate_pattern"))
| grep -i "$i" \
| sed -n -e "$appropriate_pattern"))
- if [ ${#PIDS_SOUGHT[*]} -ne 0 ]; then
- # we want to bail as soon as we get matches, because on the same
- # platform, the same set of patterns should work to find all
- # occurrences of the genesis java.
- break;
- fi
done
else
/bin/ps $extra_flags wuax >$PID_DUMP
done
else
/bin/ps $extra_flags wuax >$PID_DUMP
@@
-122,20
+117,15
@@
if [ -z "$skip_all" ]; then
# remove the first line of the file, search for the pattern the
# user wants to find, and just pluck the process ids out of the
# results.
# remove the first line of the file, search for the pattern the
# user wants to find, and just pluck the process ids out of the
# results.
+ local -a PIDS_SOUGHT
for i in "${patterns[@]}"; do
for i in "${patterns[@]}"; do
-
local -a PIDS_SOUGHT
=($(cat $PID_DUMP \
+
PIDS_SOUGHT+
=($(cat $PID_DUMP \
| sed -e '1d' \
| grep -i "$i" \
| sed -n -e "$appropriate_pattern"))
| sed -e '1d' \
| grep -i "$i" \
| sed -n -e "$appropriate_pattern"))
- if [ ${#PIDS_SOUGHT[*]} -ne 0 ]; then
- # we want to bail as soon as we get matches, because on the same
- # platform, the same set of patterns should work to find all
- # occurrences of the genesis java.
- break;
- fi
done
fi
done
fi
- if [
! -z "$PIDS_SOUGHT" ]; then echo "$PIDS_SOUGHT"
; fi
+ if [
${#PIDS_SOUGHT[*]} -ne 0 ]; then echo ${PIDS_SOUGHT[*]}
; fi
/bin/rm $PID_DUMP
}
/bin/rm $PID_DUMP
}