fixed erroneous belief that iar and oar are zips; they are tar format instead.

[feisty_meow.git] / scripts / archival / unpack.sh

diff --git a/scripts/archival/unpack.sh b/scripts/archival/unpack.sh
index 933f8f0ac7d0101fbe7075acf445e7a67af68576..f5c2aa93a2623158a169b475a280e1685c05f497 100644 (file)
--- a/scripts/archival/unpack.sh
+++ b/scripts/archival/unpack.sh
@@ -54,13 +54,16 @@ fi
 if [[ $unpack_file =~ .*\.tar$ \
     || $unpack_file =~ .*\.tar\.gz$ \
     || $unpack_file =~ .*\.tar\.bz2$ \
-    || $unpack_file =~ .*\.tgz$ ]]; then
+    || $unpack_file =~ .*\.iar$ \
+    || $unpack_file =~ .*\.oar$ \
+    || $unpack_file =~ .*\.tgz$ \
+    ]]; then
   tar -xf $unpack_file &>/dev/null
 elif [[ $unpack_file =~ .*\.zip$ \
     || $unpack_file =~ .*\.odt$ \
     || $unpack_file =~ .*\.jar$ \
-    || $unpack_file =~ .*\.iar$ \
-    || $unpack_file =~ .*\.oar$ ]]; then
+    || $unpack_file =~ .*\.war$ \
+    ]]; then
   unzip $unpack_file &>/dev/null
 fi
 save_err=$?