not adding eclipse and java at front of path, since they don't need to be there.

[feisty_meow.git] / scripts / core / functions.sh

diff --git a/scripts/core/functions.sh b/scripts/core/functions.sh
index 0313553854df6d82559e16d6c086adb10e2eeb0a..d5ab21e10a5899d20d44372e8a52cda8c9c1e924 100644 (file)
--- a/scripts/core/functions.sh
+++ b/scripts/core/functions.sh
@@ -21,7 +21,7 @@ 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/'
+    date +"%Y_%m_%d_%H%M_%S" | tr -d '/\n/'
   }
   
   # makes a directory of the name specified and then tries to change the
@@ -38,7 +38,13 @@ if [ -z "$skip_all" ]; then
     local patterns=($*)
     if [ "$OS" == "Windows_NT" ]; then
       # needs to be a windows format filename for 'type' to work.
-      local tmppid=c:\\tmp_pids.txt
+      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
@@ -51,15 +57,16 @@ 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"
-      local appropriate_pattern='s/^.*  *\([0-9][0-9]*\) *$/\1/p'
+      local CR='\r'  # 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.
+          # 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
@@ -76,9 +83,9 @@ if [ -z "$skip_all" ]; then
           | 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.
+          # 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
@@ -107,14 +114,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.