projects
/
feisty_meow.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
new fortune.
[feisty_meow.git]
/
scripts
/
core
/
functions.sh
diff --git
a/scripts/core/functions.sh
b/scripts/core/functions.sh
index a9c5dd660312c1d42fc9b020a54630ee245d2634..ab883d9d6e6bce61ced2ffb806a2d352595262e3 100644
(file)
--- a/
scripts/core/functions.sh
+++ b/
scripts/core/functions.sh
@@
-79,20
+79,18
@@
if [ -z "$skip_all" ]; then
local -a patterns=("${@}")
mkdir $TEST_TEMP/grid_logs &>/dev/null
local PID_DUMP="$(mktemp "$TMP/zz_pidlist.XXXXXX")"
local -a patterns=("${@}")
mkdir $TEST_TEMP/grid_logs &>/dev/null
local PID_DUMP="$(mktemp "$TMP/zz_pidlist.XXXXXX")"
- local
PIDS_SOUGHT=()
+ local
-a PIDS_SOUGHT
if [ "$OS" == "Windows_NT" ]; then
# needs to be a windows format filename for 'type' to work.
if [ ! -d c:/tmp ]; then
mkdir c:/tmp
fi
if [ "$OS" == "Windows_NT" ]; then
# needs to be a windows format filename for 'type' to work.
if [ ! -d c:/tmp ]; then
mkdir c:/tmp
fi
- # windows7 magical mystery tour lets us create a file c:\\tmp_pids.txt, but then it's not
really there
- #
in the root of drive c: when we look for it later. hoping to fix that problem by using a subdir, which
- # also might be magical thinking from windows perspective.
+ # windows7 magical mystery tour lets us create a file c:\\tmp_pids.txt, but then it's not
+ #
really there in the root of drive c: when we look for it later. hoping to fix that
+ #
problem by using a subdir, which
also might be magical thinking from windows perspective.
tmppid=c:\\tmp\\pids.txt
tmppid=c:\\tmp\\pids.txt
- # we have abandoned all hope of relying on ps on windows. instead
- # we use wmic to get full command lines for processes.
- # this does not exist on windows home edition. we are hosed if that's
- # what they insist on testing on.
+ # we have abandoned all hope of relying on ps on windows. instead we use wmic to get full
+ # command lines for processes.
wmic /locale:ms_409 PROCESS get processid,commandline </dev/null >"$tmppid"
local flag='/c'
if [ ! -z "$(uname -a | grep "^MING" )" ]; then
wmic /locale:ms_409 PROCESS get processid,commandline </dev/null >"$tmppid"
local flag='/c'
if [ ! -z "$(uname -a | grep "^MING" )" ]; then
@@
-101,19
+99,14
@@
if [ -z "$skip_all" ]; then
# we 'type' the file to get rid of the unicode result from wmic.
cmd $flag type "$tmppid" >$PID_DUMP
\rm "$tmppid"
# we 'type' the file to get rid of the unicode result from wmic.
cmd $flag type "$tmppid" >$PID_DUMP
\rm "$tmppid"
- 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 appropriate_pattern="s/^.* *\([0-9][0-9]*\) *\$/\1/p"
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
@@
-123,19
+116,18
@@
if [ -z "$skip_all" ]; then
# user wants to find, and just pluck the process ids out of the
# results.
for i in "${patterns[@]}"; do
# user wants to find, and just pluck the process ids out of the
# results.
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
+ local PIDS_SOUGHT2=$(printf -- '%s\n' ${PIDS_SOUGHT[@]} | sort | uniq)
+ PIDS_SOUGHT=()
+ PIDS_SOUGHT=${PIDS_SOUGHT2[*]}
+ echo ${PIDS_SOUGHT[*]}
+ fi
/bin/rm $PID_DUMP
}
/bin/rm $PID_DUMP
}
@@
-146,13
+138,13
@@
if [ -z "$skip_all" ]; then
echo "psa finds processes by pattern, but there was no pattern on the command line."
return 1
fi
echo "psa finds processes by pattern, but there was no pattern on the command line."
return 1
fi
- p=$(psfind "$
1
")
+ p=$(psfind "$
{@}
")
if [ -z "$p" ]; then
# no matches.
return 0
fi
echo ""
if [ -z "$p" ]; then
# no matches.
return 0
fi
echo ""
- echo "Processes
containing \"$1\"
..."
+ echo "Processes
matching ${@}
..."
echo ""
if [ -n "$IS_DARWIN" ]; then
unset fuzil_sentinel
echo ""
if [ -n "$IS_DARWIN" ]; then
unset fuzil_sentinel