X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Farchival%2Funpack.sh;h=6670f489f8b408da83baa6983006bd1cb0a398d6;hb=ab2a48e90c0f3778c267862bc125d5f2d4b3bb73;hp=744d354880bb8c7e472c3615cc0ff3b940ce584f;hpb=c160b4bac86a40cf5ce4fc0dcdab69afc5edad2f;p=feisty_meow.git diff --git a/scripts/archival/unpack.sh b/scripts/archival/unpack.sh index 744d3548..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 arch_$(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$ \