Fix outfile name change in archive.sh

Author: Tom Barnes

src/integration-tests/bash/archive.sh

@@ -24,18 +24,19 @@ function fail {
 function archive {
   local SOURCE_DIR="${1?}"
   local ARCHIVE_DIR="${2?}"
-  local ARCHIVE="$ARCHIVE_DIR/IntSuite.`date '+%Y%m%d%H%M%S'`.tar.gz"
+  local ARCHIVE_FILE="IntSuite.`date '+%Y%m%d%H%M%S'`.tar.gz"
+  local ARCHIVE="$ARCHIVE_DIR/$ARCHIVE_FILE"
+  local OUTFILE="/tmp/$ARCHIVE_FILE"
 
   trace About to archive \'$SOURCE_DIR\'.
 
   [ ! -d "$SOURCE_DIR" ] && fail Could not archive, could not find source directory \'$SOURCE_DIR\'.
 
   mkdir -p $ARCHIVE_DIR || fail Could not archive, could not create target directory \'$ARCHIVE_DIR\'.
 
-  local outfile=/tmp/${ARCHIVE}.out
-  tar -czf $ARCHIVE $SOURCE_DIR > $outfile 2>&1 
-  [ $? -eq 0 ] || fail "Could not archive, 'tar -czf $ARCHIVE $SOURCE_DIR' command failed: `cat $outfile`"
-  rm -f $outfile
+  tar -czf $ARCHIVE $SOURCE_DIR > $OUTFILE 2>&1 
+  [ $? -eq 0 ] || fail "Could not archive, 'tar -czf $ARCHIVE $SOURCE_DIR' command failed: `cat $OUTFILE`"
+  rm -f $OUTFILE
 
   find $ARCHIVE_DIR -maxdepth 1 -name "IntSuite*tar.gz" | sort -r | awk '{ if (NR>5) print $NF }' | xargs rm -f