more organized archive folder

Signed-off-by: Jason Etheridge <jason@esilibrary.com>

diff --git a/qa/test.sh b/qa/test.sh
index 5a73331..305619d 100755 (executable)
--- a/qa/test.sh
+++ b/qa/test.sh
@@ -24,10 +24,11 @@ echo "*** Script pushed"
 
 echo "*** Archiving previous test run"
 cd $LOCAL_HTML_PATH || exit -1
-export ARCHIVE_DIR=`date +%F_%T` || exit -1
-mkdir -p archive/$ARCHIVE_DIR || exit -1
-mv *.* archive/$ARCHIVE_DIR || exit -1
-cp archive/$ARCHIVE_DIR/*.hash . || exit -1
+export ARCHIVE_DIR=`date +%Y-%m` || exit -1
+export ARCHIVE_SUBDIR=`date +%F_%T` || exit -1
+mkdir -p archive/$ARCHIVE_DIR/$ARCHIVE_SUBDIR || exit -1
+mv *.* archive/$ARCHIVE_DIR/$ARCHIVE_SUBDIR || exit -1
+cp archive/$ARCHIVE_DIR/$ARCHIVE_SUBDIR/*.hash . || exit -1
 echo "*** Test archived"
 
 echo "*** Setting up new output"