From c70c2d52132d284f97fc79e08abdcc347aae7078 Mon Sep 17 00:00:00 2001
From: Douglas Clowes <dcl@ansto.gov.au>
Date: Fri, 5 Jul 2013 11:18:53 +1000
Subject: [PATCH] Push FILEMAP.TXT down to the newserver directory and reduce
 duplication

---
 site_ansto/instrument/deploySICS.sh | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/site_ansto/instrument/deploySICS.sh b/site_ansto/instrument/deploySICS.sh
index d2e8f9cb..1d719fd1 100755
--- a/site_ansto/instrument/deploySICS.sh
+++ b/site_ansto/instrument/deploySICS.sh
@@ -164,24 +164,19 @@ then
   DESTHOST=${2:-ics1-test.nbi.ansto.gov.au}
   DESTDIR=${3:-/usr/local}/TEST_SICS/$INSTRUMENT
   TARDIR=${DESTDIR:1}
-  # remove and recreate the temporary directory
-  rm -fr $TEMPDIR/$DESTDIR
-  mkdir -p $TEMPDIR/$DESTDIR
-  FILEMAP=$TEMPDIR/$DESTDIR/FILEMAP.TXT
-  init_file_map
   # step down to the sics directory
   DESTDIR=$DESTDIR/$SICSDIR
-  mkdir -p $TEMPDIR/$DESTDIR
 else
   DESTDIR=${3:-/usr/local}/$SICSDIR
   TARDIR=${DESTDIR:1}
-  # remove and recreate the temporary directory
-  rm -fr $TEMPDIR/$DESTDIR
-  mkdir -p $TEMPDIR/$DESTDIR
-  FILEMAP=$TEMPDIR/$DESTDIR/FILEMAP.TXT
-  init_file_map
 fi
 
+# remove and recreate the temporary directory
+rm -fr $TEMPDIR/$DESTDIR
+mkdir -p $TEMPDIR/$DESTDIR/newserver
+FILEMAP=$TEMPDIR/$DESTDIR/newserver/FILEMAP.TXT
+init_file_map
+
 # Notify progress and intention
 echo "Deploying $INSTRUMENT to $DESTHOST:$DESTDIR"