No longer need to link inst dirs to inst names.

r1276 | ffr | 2006-11-10 16:17:13 +1100 (Fri, 10 Nov 2006) | 2 lines

site_ansto/instrument/deploySICS.sh

@@ -1,6 +1,6 @@
 #!/bin/sh 
-# $Revision: 1.9 $
-# $Date: 2006-11-08 06:00:13 $
+# $Revision: 1.10 $
+# $Date: 2006-11-10 05:17:13 $
 # Author: Ferdi Franceschini (ffr@ansto.gov.au)
 # Last revision by $Author: ffr $
 
@@ -35,36 +35,43 @@ rm -fr ~/tmp/$DESTDIR/*
 
 # Set the destination host and the
 # instrument src directory
+TESTING=$(dirname $INSTRUMENT)
+INSTRUMENT=$(basename $INSTRUMENT)
+
 case $INSTRUMENT in 
 echidna)
 DESTHOST=${2:-ics1-echidna.nbi.ansto.gov.au}
-INSTSRC=$INSTRUMENT;;
+INSTSRC=hrpd;;
 wombat)
 DESTHOST=${2:-ics1-wombat.nbi.ansto.gov.au}
-INSTSRC=$INSTRUMENT;;
+INSTSRC=hipd;;
 koala)
 DESTHOST=${2:-ics1-koala.nbi.ansto.gov.au}
-INSTSRC=$INSTRUMENT;;
+INSTSRC=qld;;
 platypus)
 DESTHOST=${2:-ics1-platypus.nbi.ansto.gov.au}
-INSTSRC=$INSTRUMENT;;
+INSTSRC=reflectometer;;
 kowari)
 DESTHOST=${2:-ics1-kowari.nbi.ansto.gov.au}
-INSTSRC=$INSTRUMENT;;
+INSTSRC=rsd;;
 quokka)
 DESTHOST=${2:-ics1-quokka.nbi.ansto.gov.au}
-INSTSRC=$INSTRUMENT;;
+INSTSRC=sans;;
+pelican)
+DESTHOST=${2:-ics1-pelican.nbi.ansto.gov.au}
+INSTSRC=pas;;
 taipan)
 DESTHOST=${2:-ics1-taipan.nbi.ansto.gov.au}
-INSTSRC=$INSTRUMENT;;
-test/*)
+INSTSRC=tas;;
+esac
+
+if [ $TESTING="test" ]; then
 #copy TEST_SICS/fakeDMC
 #TESTSRC=TEST_SICS
 cp -a TEST_SICS/* ~/tmp/$DESTDIR
 rm -fr $(find ~/tmp/$DESTDIR -name CVS)
 DESTHOST=$2
-INSTSRC=$(basename $INSTRUMENT);;
-esac
+fi
 
 echo $DESTHOST
 if [ $DESTHOST = "localhost" ]
@@ -87,7 +94,7 @@ exit 1
 fi
 
 # Generate instrument description xml
-./hipadaba/gen_hpdbxml.tcl $INSTSRC
+./hipadaba/gen_hpdbxml.tcl $INSTRUMENT
 # Get list of files to copy 
 COMMON=$(for f in $(cat $SRCDIR/MANIFEST.TXT); do echo -n "$SRCDIR/$f "; done)
 INSTSPEC=$(for f in $(cat $INSTSRC/MANIFEST.TXT); do echo -n "$INSTSRC/$f "; done)