X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Fcore%2Ffunctions.sh;h=44a1bc0b2630cd7442d7fd25b11e3dd669fab0b9;hb=7fe5a1ac2f1b8e88e40ba44358f30b53334297aa;hp=da516467b57e947408c6108e5040ed6cd4cba5a3;hpb=f7761f64aefda43f4afec408f1cfe20afc063bc8;p=feisty_meow.git

diff --git a/scripts/core/functions.sh b/scripts/core/functions.sh
index da516467..44a1bc0b 100644
--- a/scripts/core/functions.sh
+++ b/scripts/core/functions.sh
@@ -4,12 +4,13 @@
 
 # test whether we've been here before or not.
 skip_all=
-date_stringer &>/dev/null
+function_sentinel &>/dev/null
 if [ $? -eq 0 ]; then
   # there was no error, so we can skip the inits.
   if [ ! -z "$SHELL_DEBUG" ]; then
     echo skipping functions.sh because already defined.
   fi
+  skip_all=yes
 fi
 
 if [ -z "$skip_all" ]; then
@@ -20,7 +21,9 @@ if [ -z "$skip_all" ]; then
   # a handy little method that can be used for date strings.  it was getting
   # really tiresome how many different ways the script did the date formatting.
   function date_stringer() {
-    date +"%Y_%m_%e_%H%M_%S" | tr -d '/\n/'
+    local sep="$1"; shift
+    if [ -z "$sep" ]; then sep='_'; fi
+    date +"%Y$sep%m$sep%d$sep%H%M$sep%S" | tr -d '/\n/'
   }
   
   # makes a directory of the name specified and then tries to change the
@@ -32,24 +35,63 @@ 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.
+      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.
+      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 CR='
'  # embedded carriage return.
+      local appropriate_pattern="s/^.*  *\([0-9][0-9]*\)[ $CR]*\$/\1/p"
+      for i in "${patterns[@]}"; do
+        PIDS_SOUGHT+=$(cat $PID_DUMP \
+          | 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
       # 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
   }
@@ -74,14 +116,14 @@ if [ -z "$skip_all" ]; then
           fuzil_sentinel=true
         done
       else 
-        # cases besides darwin OS (for macs).
+        # cases besides mac os x's darwin.
         extra_flags=
         if [ "$OS" = "Windows_NT" ]; then
           # special case for windows.
           extra_flags=-W
           ps | head -1
           for curr in $p; do
-            ps $extra_flags | grep "^ *$curr" 
+            ps $extra_flags | grep "$curr" 
           done
         else
           # normal OSes can handle a nice simple query.
@@ -204,6 +246,8 @@ if [ -z "$skip_all" ]; then
       nechung
     fi
   }
+
+  function function_sentinel() { return 0; }
   
   if [ ! -z "$SHELL_DEBUG" ]; then echo function definitions end....; fi