X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Fcore%2Ffunctions.sh;h=fe56aea63a2624d73f5603b55264d0aa56064444;hb=bffe9fba70b7ea1ab1b5d963b811d4637b021ee1;hp=61e19c4abf32c2cb5d42c444dedcaed3a9a33483;hpb=d7b0d4b552c9eda6ab0af9d8c7e5ecbb708db622;p=feisty_meow.git

diff --git a/scripts/core/functions.sh b/scripts/core/functions.sh
index 61e19c4a..fe56aea6 100644
--- a/scripts/core/functions.sh
+++ b/scripts/core/functions.sh
@@ -99,11 +99,15 @@ 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() {
-    p=$(psfind "$1")
-    if [ -z "$p" ]; then
+    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
+      # no matches.
+      return 0
+    fi
     echo ""
     echo "Processes containing \"$1\"..."
     echo ""
@@ -152,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.
@@ -207,26 +211,6 @@ if [ -z "$skip_all" ]; then
     fi
   }
   
-  # buntar is a long needed uncompressing macro that feeds into tar -x.
-  # it takes a list of bz2 file names and extracts their contents into
-  # sequentially numbered directories.
-  function buntar() {
-    index=1
-    for i in $*; do
-      mkdir buntar_$index
-      pushd buntar_$index &>/dev/null
-      file=$i
-      # if the filename has no directory component, we will assume it used to
-      # be above our unzipping directory here.
-      if [ "$(basename $file)" = $file ]; then
-        file=../$file
-      fi
-      bunzip2 -d -c $file | tar -xf -
-      popd &>/dev/null
-      index=$(expr $index + 1)
-    done
-  }
-  
   # trashes the .#blah files that cvs and svn leave behind when finding conflicts.
   # this kind of assumes you've already checked them for any salient facts.
   function clean_cvs_junk() {
@@ -234,20 +218,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; }