X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Farchival%2Funpack.sh;h=6670f489f8b408da83baa6983006bd1cb0a398d6;hb=5d16eec185d98c20c4d80e4fb63fdd8d17a121fd;hp=89573aba768c6fce365912da3d918f35860d0b46;hpb=bec32148b61e15c5645a58a2eddee978f7658671;p=feisty_meow.git

diff --git a/scripts/archival/unpack.sh b/scripts/archival/unpack.sh
index 89573aba..6670f489 100644
--- a/scripts/archival/unpack.sh
+++ b/scripts/archival/unpack.sh
@@ -25,7 +25,8 @@ if [ ! -f "$archive_file" ]; then
 fi
 unpack_dir="$1"; shift
 if [ -z "$unpack_dir" ]; then
-  unpack_dir=$(echo from_$(basename $archive_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
@@ -58,6 +59,7 @@ if [[ $archive_file =~ .*\.tar$ \
     || $archive_file =~ .*\.oar$ \
     || $archive_file =~ .*\.tgz$ \
     || $archive_file =~ .*\.ova$ \
+    || $archive_file =~ .*\.snarf$ \
     ]]; then
   tar -xf $archive_file &>/dev/null
 elif [[ $archive_file =~ .*\.zip$ \