From: Chris Koeritz Date: Sat, 8 Sep 2012 19:52:54 +0000 (-0400) Subject: fixed fortune reference to ananova, cleaned up somewhat final version of unpack script. X-Git-Tag: 2.140.90~1254 X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=fed1fa6721d7df4c0c369c8a4329181f89222829;p=feisty_meow.git fixed fortune reference to ananova, cleaned up somewhat final version of unpack script. --- diff --git a/database/fortunes.dat b/database/fortunes.dat index e56625ae..0b91e10a 100644 --- a/database/fortunes.dat +++ b/database/fortunes.dat @@ -13360,7 +13360,7 @@ only different kinds of good weather. -- John Ruskin ~ She's not a babe. She's a sophisticated real-time computer system. - -- Spokesman for Anova, a virtual news anchor + -- Spokesman for Ananova, a virtual news anchor ~ The man who laughs has not yet been told the terrible news. -- Berthold Brecht diff --git a/scripts/archival/unpack.sh b/scripts/archival/unpack.sh index cabb65d3..dfa3d1c3 100644 --- a/scripts/archival/unpack.sh +++ b/scripts/archival/unpack.sh @@ -37,7 +37,7 @@ if [ ! -d "$unpack_dir" ]; then fi # save where we started out. -ORIGINATING_FOLDER="$( \cd "$(\dirname "$0")" && \pwd )" +ORIGINATING_FOLDER="$( \pwd )" pushd "$unpack_dir" &>/dev/null @@ -51,13 +51,12 @@ if [ ! -f "$unpack_file" ]; then fi fi -if [[ $unpack_file =~ .*\.tar ]]; then - tar -f $unpack_file -elif [[ $unpack_file =~ .*\.tar\.gz \ - || $unpack_file =~ .*\.tar\.bz2 \ - || $unpack_file =~ .*\.tgz ]]; then +if [[ $unpack_file =~ .*\.tar$ \ + || $unpack_file =~ .*\.tar\.gz$ \ + || $unpack_file =~ .*\.tar\.bz2$ \ + || $unpack_file =~ .*\.tgz$ ]]; then tar -xf $unpack_file -elif [[ $unpack_file =~ .*\.zip ]]; then +elif [[ $unpack_file =~ .*\.zip$ ]]; then unzip $unpack_file fi save_err=$?