updated to handle tar files without compression in unpack, removed

old buntar macro that only handled bz2 anyway--unpack is better.

diff --git a/scripts/archival/unpack.sh b/scripts/archival/unpack.sh
index 38629ec8a3dee9b59e4e715c302ba26a4c4fec0f..cabb65d397dc5b0fb4c91a6f77ebc83c84aba36c 100644 (file)
--- a/scripts/archival/unpack.sh
+++ b/scripts/archival/unpack.sh
@@ -51,7 +51,9 @@ if [ ! -f "$unpack_file" ]; then
   fi
 fi
 
-if [[ $unpack_file =~ .*\.tar\.gz \
+if [[ $unpack_file =~ .*\.tar ]]; then
+  tar -f $unpack_file
+elif [[ $unpack_file =~ .*\.tar\.gz \
     || $unpack_file =~ .*\.tar\.bz2 \
     || $unpack_file =~ .*\.tgz ]]; then
   tar -xf $unpack_file

diff --git a/scripts/core/functions.sh b/scripts/core/functions.sh
index 933a7fff410dad87698272ae558cbbb9589104bb..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() {