X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Fcore%2Ffunctions.sh;h=933a7fff410dad87698272ae558cbbb9589104bb;hb=499a5c0aaa492d73afe975409476e7ccdec316f4;hp=d5ab21e10a5899d20d44372e8a52cda8c9c1e924;hpb=7876831b338ec827cffda6792ef77f444b18eb6e;p=feisty_meow.git

diff --git a/scripts/core/functions.sh b/scripts/core/functions.sh
index d5ab21e1..933a7fff 100644
--- 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
@@ -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 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
+    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
   }
@@ -148,10 +156,10 @@ if [ -z "$skip_all" ]; then
     sudo /etc/init.d/alsasound restart
   }
   
-  # switches from a /X/path form to an X:/ form.
+  # switches from a /X/path form to an X:/ form.  this also processes cygwin paths.
   function msys_to_dos_path() {
     # we always remove dos slashes in favor of forward slashes.
-    echo "$1" | sed -e 's/\\/\//g' | sed -e 's/\/\([a-zA-Z]\)\/\(.*\)/\1:\/\2/'
+    echo "$1" | sed -e 's/\\/\//g' | sed -e 's/\/cygdrive//' | sed -e 's/\/\([a-zA-Z]\)\/\(.*\)/\1:\/\2/'
   }
   
   # switches from an X:/ form to an /X/path form.
@@ -230,20 +238,25 @@ if [ -z "$skip_all" ]; then
       find $i -follow -type f -iname ".#*" -exec perl $FEISTY_MEOW_SCRIPTS/files/safedel.pl {} ";" 
     done
   }
-  
-  # recreates all the generated files that the feisty meow scripts use.
-  function regenerate() {
-    bash $FEISTY_MEOW_SCRIPTS/core/bootstrap_shells.sh
-    echo
+
+  # overlay for nechung binary so that we can complain less grossly about it when it's missing.
+  function nechung() {
     local wheres_nechung=$(which nechung 2>/dev/null)
     if [ -z "$wheres_nechung" ]; then
       echo "The nechung oracle program cannot be found.  You may want to consider"
       echo "rebuilding the feisty meow applications with this command:"
       echo "   bash $FEISTY_MEOW_DIR/scripts/generator/bootstrap_build.sh"
     else
-      nechung
+      $wheres_nechung
     fi
   }
+  
+  # recreates all the generated files that the feisty meow scripts use.
+  function regenerate() {
+    bash $FEISTY_MEOW_SCRIPTS/core/bootstrap_shells.sh
+    echo
+    nechung
+  }
 
   function function_sentinel() { return 0; }