From: Chris Koeritz Date: Sat, 8 Sep 2012 20:09:31 +0000 (-0400) Subject: tossing zip's output, and tar's for the heck of it (although it had none). X-Git-Tag: 2.140.90~1252 X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=9defeb8f11f97fd88c8cd4dddc079e77d14259d9;p=feisty_meow.git tossing zip's output, and tar's for the heck of it (although it had none). --- diff --git a/scripts/archival/unpack.sh b/scripts/archival/unpack.sh index dfa3d1c3..5641df96 100644 --- a/scripts/archival/unpack.sh +++ b/scripts/archival/unpack.sh @@ -55,16 +55,17 @@ if [[ $unpack_file =~ .*\.tar$ \ || $unpack_file =~ .*\.tar\.gz$ \ || $unpack_file =~ .*\.tar\.bz2$ \ || $unpack_file =~ .*\.tgz$ ]]; then - tar -xf $unpack_file + tar -xf $unpack_file &>/dev/null elif [[ $unpack_file =~ .*\.zip$ ]]; then - unzip $unpack_file + unzip $unpack_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 "into the directory: $unpack_dir" - popd &>/dev/null exit 1 else echo "Unpacked file $(basename $unpack_file) into folder: $unpack_dir"