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