X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Farchival%2Funpack.sh;h=6670f489f8b408da83baa6983006bd1cb0a398d6;hb=ab2a48e90c0f3778c267862bc125d5f2d4b3bb73;hp=f5c2aa93a2623158a169b475a280e1685c05f497;hpb=26ec1dc25e8142729a1ebf3058d48289e2548a50;p=feisty_meow.git

diff --git a/scripts/archival/unpack.sh b/scripts/archival/unpack.sh
index f5c2aa93..6670f489 100644
--- a/scripts/archival/unpack.sh
+++ b/scripts/archival/unpack.sh
@@ -13,19 +13,20 @@
 # An arbitrary format archive unpacker, although really we are mainly supporting
 # tar and zip currently, including compressed formats.
 
-unpack_file="$1"; shift
-if [ -z "$unpack_file" ]; then
+archive_file="$1"; shift
+if [ -z "$archive_file" ]; then
   echo "This script takes one archive name (in .tar.gz, .zip, etc. formats) and"
   echo "unpacks the archive with the appropriate tool."
   exit 1
 fi
-if [ ! -f "$unpack_file" ]; then
-  echo "The file specified for unpacking cannot be located: $unpack_file"
+if [ ! -f "$archive_file" ]; then
+  echo "The file specified cannot be located: $archive_file"
   exit 1
 fi
 unpack_dir="$1"; shift
 if [ -z "$unpack_dir" ]; then
-  unpack_dir=$(echo unpacked_$(basename $unpack_file) | sed -e 's/^\([^\.]*\)\..*/\1/')
+  all_but_last="$(echo "$(basename $archive_file)" | sed -e 's/\([\^.]*\)\.[^\.]*$/\1/')"
+  unpack_dir="arch_${all_but_last}"
 fi
 
 if [ ! -d "$unpack_dir" ]; then
@@ -41,41 +42,44 @@ ORIGINATING_FOLDER="$( \pwd )"
 
 pushd "$unpack_dir" &>/dev/null
 
-if [ ! -f "$unpack_file" ]; then
+if [ ! -f "$archive_file" ]; then
   # we're assuming we left it behind in our previous directory.
-  unpack_file="$ORIGINATING_FOLDER/$unpack_file"
-  if [ ! -f "$unpack_file" ]; then
+  archive_file="$ORIGINATING_FOLDER/$archive_file"
+  if [ ! -f "$archive_file" ]; then
     echo "Could not find file to unpack after shifting directories.  Sorry."
-    echo "Tried to locate it as: $unpack_file"
+    echo "Tried to locate it as: $archive_file"
     exit 1
   fi
 fi
 
-if [[ $unpack_file =~ .*\.tar$ \
-    || $unpack_file =~ .*\.tar\.gz$ \
-    || $unpack_file =~ .*\.tar\.bz2$ \
-    || $unpack_file =~ .*\.iar$ \
-    || $unpack_file =~ .*\.oar$ \
-    || $unpack_file =~ .*\.tgz$ \
+if [[ $archive_file =~ .*\.tar$ \
+    || $archive_file =~ .*\.tar\.gz$ \
+    || $archive_file =~ .*\.tar\.bz2$ \
+    || $archive_file =~ .*\.iar$ \
+    || $archive_file =~ .*\.oar$ \
+    || $archive_file =~ .*\.tgz$ \
+    || $archive_file =~ .*\.ova$ \
+    || $archive_file =~ .*\.snarf$ \
     ]]; then
-  tar -xf $unpack_file &>/dev/null
-elif [[ $unpack_file =~ .*\.zip$ \
-    || $unpack_file =~ .*\.odt$ \
-    || $unpack_file =~ .*\.jar$ \
-    || $unpack_file =~ .*\.war$ \
+  tar -xf $archive_file &>/dev/null
+elif [[ $archive_file =~ .*\.zip$ \
+    || $archive_file =~ .*\.epub$ \
+    || $archive_file =~ .*\.odt$ \
+    || $archive_file =~ .*\.jar$ \
+    || $archive_file =~ .*\.war$ \
     ]]; then
-  unzip $unpack_file &>/dev/null
+  unzip $archive_file &>/dev/null
 fi
 save_err=$?
 
 popd &>/dev/null
 
 if [ $save_err -ne 0 ]; then
-  echo "There was a failure reported while unpacking: $unpack_file"
+  echo "There was a failure reported while unpacking: $archive_file"
   echo "into the directory: $unpack_dir"
   exit 1
 else
-  echo "Unpacked file $(basename $unpack_file) into folder: $unpack_dir"
+  echo "Unpacked file $(basename $archive_file) into folder: $unpack_dir"
 fi