updated to handle tar files without compression in unpack, removed

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

diff --git a/scripts/core/functions.sh b/scripts/core/functions.sh
index aa8ac20407988383c23749a79d268223628c64f4..fe56aea63a2624d73f5603b55264d0aa56064444 100644 (file)
--- a/scripts/core/functions.sh
+++ b/scripts/core/functions.sh
@@ -211,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() {
@@ -238,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; }