updated for making cygwin behave a bit better. still not right though.

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

diff --git a/scripts/core/functions.sh b/scripts/core/functions.sh
index 6a5253c7748253cb3c019d8de7e16f6ce8ff9951..20bb047567d2e0fd831c5eab79cdce9b2a57c640 100644 (file)
--- a/scripts/core/functions.sh
+++ b/scripts/core/functions.sh
@@ -21,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_%d_%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
@@ -64,9 +66,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
@@ -83,9 +85,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
@@ -97,36 +99,42 @@ if [ -z "$skip_all" ]; then
   # finds all processes matching the pattern specified and shows their full
   # process listing (whereas psfind just lists process ids).
   function psa() {
+    if [ -z "$1" ]; then
+      echo "psa finds processes by pattern, but there was no pattern on the command line."
+      return 1
+    fi
     p=$(psfind "$1")
-    if [ ! -z "$p" ]; then
-      echo ""
-      echo "Processes containing \"$1\"..."
-      echo ""
-      if [ -n "$IS_DARWIN" ]; then
-        unset fuzil_sentinel
-        for i in $p; do
-          # only print the header the first time.
-          if [ -z "$fuzil_sentinel" ]; then
-            ps $i -w -u
-          else
-            ps $i -w -u | sed -e '1d'
-          fi
-          fuzil_sentinel=true
-        done
-      else 
-        # cases besides darwin OS (for macs).
-        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" 
-          done
+    if [ -z "$p" ]; then
+      # no matches.
+      return 0
+    fi
+    echo ""
+    echo "Processes containing \"$1\"..."
+    echo ""
+    if [ -n "$IS_DARWIN" ]; then
+      unset fuzil_sentinel
+      for i in $p; do
+        # only print the header the first time.
+        if [ -z "$fuzil_sentinel" ]; then
+          ps $i -w -u
         else
-          # normal OSes can handle a nice simple query.
-          ps wu $p
+          ps $i -w -u | sed -e '1d'
         fi
+        fuzil_sentinel=true
+      done
+    else 
+      # 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" 
+        done
+      else
+        # normal OSes can handle a nice simple query.
+        ps wu $p
       fi
     fi
   }