added better support for dos process finds.

diff --git a/scripts/core/functions.sh b/scripts/core/functions.sh
index e1efcc1845234e71f9c4784b4c2f38560d515970..72258731f964960b810796801498c43909b913a9 100644 (file)
--- a/scripts/core/functions.sh
+++ b/scripts/core/functions.sh
@@ -33,24 +33,60 @@ if [ -z "$skip_all" ]; then
   
   # locates a process given a search pattern to match in the process list.
   function psfind() {
-    PID_DUMP="$(mktemp "$TMP/zz_pidlist.XXXXXX")"
-    appropriate_pattern='s/^[-a-zA-Z_0-9][-a-zA-Z_0-9]*  *\([0-9][0-9]*\).*$/\1/p'
+    local PID_DUMP="$(mktemp "$TMP/zz_pidlist.XXXXXX")"
+    local PIDS_SOUGHT=()
+    local patterns=($*)
+    if [ "$OS" == "Windows_NT" ]; then
+      # needs to be a windows format filename for 'type' to work.
+      local 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.
+      wmic /locale:ms_409 PROCESS get processid,commandline </dev/null >"$tmppid"
+      local flag='/c'
+      if [ ! -z "$(uname -a | grep "^MING" )" ]; then
+        flag='//c'
+      fi
+      # we 'type' the file to get rid of the unicode result from wmic.
+      cmd $flag type "$tmppid" >$PID_DUMP
+      \rm "$tmppid"
+      local appropriate_pattern='s/^.*  *\([0-9][0-9]*\) *$/\1/p'
+      for i in "${patterns[@]}"; do
+#echo "pattern $i seek" >>~/crap.txt
+        PIDS_SOUGHT+=$(cat $PID_DUMP \
+          | grep -i "$i" \
+          | sed -n -e "$appropriate_pattern")
+#cp $PID_DUMP ~/crud
+#echo heres the dump after grep >>~/crap.txt
+#cat $PID_DUMP | grep -i "$i" >>~/crap.txt
+        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
       # pattern to use for peeling off the process numbers.
-    extra_flags=
-      # flags to pass to ps if any special ones are needed.
-    if [ "$OS" = "Windows_NT" ]; then
-      # on win32, there is some weirdness to support msys.
-      appropriate_pattern='s/^[        ]*\([0-9][0-9]*\).*$/\1/p'
-      extra_flags=-W
+      local appropriate_pattern='s/^[-a-zA-Z_0-9][-a-zA-Z_0-9]*  *\([0-9][0-9]*\).*$/\1/p'
+      # 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.
+      for i in "${patterns[@]}"; do
+        PIDS_SOUGHT=$(cat $PID_DUMP \
+          | 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
-    /bin/ps $extra_flags wuax >$PID_DUMP
-    # 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.
-    PIDS_SOUGHT=$(cat $PID_DUMP \
-      | sed -e '1d' \
-      | grep -i "$1" \
-      | sed -n -e "$appropriate_pattern")
     if [ ! -z "$PIDS_SOUGHT" ]; then echo "$PIDS_SOUGHT"; fi
     /bin/rm $PID_DUMP
   }