Added support for deploying lyrebird and taipan to /usr/local/nbi
Now touches DataNumber, extraconfig.tcl and nexus.dic and sets the appropriate ownership on all files. Most files are owned by root. r3056 | ffr | 2011-02-16 15:34:37 +1100 (Wed, 16 Feb 2011) | 3 lines
This commit is contained in:
committed by
Douglas Clowes
parent
fb86744209
commit
69c79771cb
@@ -64,16 +64,6 @@ else
|
||||
DEPLOY="YES"
|
||||
fi
|
||||
|
||||
if [[ "$1" = "-x" ]]
|
||||
then
|
||||
EXEONLY="YES"
|
||||
EXEPATH="/sics/newserver/SICServer"
|
||||
shift
|
||||
else
|
||||
EXEONLY="NO"
|
||||
EXEPATH=""
|
||||
fi
|
||||
|
||||
if [ $# -eq 0 -o $# -gt 3 ]
|
||||
then
|
||||
usage
|
||||
@@ -97,6 +87,7 @@ TEMPDIR=$HOME/tmp
|
||||
# instrument name and the
|
||||
# instrument src directory
|
||||
|
||||
SICSDIR=sics
|
||||
case $INSTRUMENT in
|
||||
echidna|hrpd)
|
||||
INSTRUMENT=echidna
|
||||
@@ -129,10 +120,12 @@ INSTSRC=$SRCDIR/pas;;
|
||||
lyrebird|lyrebird)
|
||||
INSTRUMENT=lyrebird
|
||||
DESTHOST=${2:-ics1-lyrebird.nbi.ansto.gov.au}
|
||||
SICSDIR=nbi/lyrebird
|
||||
INSTSRC=$SRCDIR/lyrebird;;
|
||||
taipan|tas)
|
||||
INSTRUMENT=taipan
|
||||
DESTHOST=${2:-ics1-taipan.nbi.ansto.gov.au}
|
||||
SICSDIR=nbi/taipan
|
||||
INSTSRC=$SRCDIR/tas;;
|
||||
esac
|
||||
INSTCFDIR=$INSTSRC/config
|
||||
@@ -147,14 +140,14 @@ then
|
||||
# remove and recreate the temporary directory
|
||||
rm -fr $TEMPDIR/$DESTDIR
|
||||
mkdir -p $TEMPDIR/$DESTDIR
|
||||
#copy TEST_SICS/fakeDMC and remove CVS any directories
|
||||
#copy TEST_SICS/fakeDMC and remove .svn any directories
|
||||
cp -a $SRCDIR/TEST_SICS/* $TEMPDIR/$DESTDIR
|
||||
rm -fr $(find $TEMPDIR/$DESTDIR -name CVS)
|
||||
rm -fr $(find $TEMPDIR/$DESTDIR -name .svn)
|
||||
# step down to the sics directory
|
||||
DESTDIR=$DESTDIR/sics
|
||||
DESTDIR=$DESTDIR/$SICSDIR
|
||||
mkdir -p $TEMPDIR/$DESTDIR
|
||||
else
|
||||
DESTDIR=${3:-/usr/local}/sics
|
||||
DESTDIR=${3:-/usr/local}/$SICSDIR
|
||||
TARDIR=${DESTDIR:1}
|
||||
# remove and recreate the temporary directory
|
||||
rm -fr $TEMPDIR/$DESTDIR
|
||||
@@ -163,14 +156,18 @@ fi
|
||||
|
||||
echo "Deploying $INSTRUMENT to $DESTHOST:$DESTDIR"
|
||||
|
||||
|
||||
EXTRACT_CMDS="tar vxzp -C /; touch /$DESTDIR/{DataNumber,extraconfig.tcl,newserver/config/nexus/nexus.dic,script_validator/DataNumber}"
|
||||
if [[ "$DESTHOST" = "localhost" ]]
|
||||
then
|
||||
EXTRACT="tar vxzp -C /"
|
||||
EXTRACT_NODEPLOY="tar vxzp -C /"
|
||||
EXTRACT=$EXTRACT_CMDS
|
||||
EXTRACT_NODEPLOY=$EXTRACT_CMDS
|
||||
elif [[ "$TESTING" != "test" ]]
|
||||
then
|
||||
EXTRACT="ssh $DESTHOST $EXTRACT_CMDS; chown -R root:root /$DESTDIR; chown ${INSTRUMENT}_sics. /$DESTDIR/{DataNumber,newserver/config/nexus/nexus.dic,script_validator/{DataNumber,data}}; chown ${INSTRUMENT}. /$DESTDIR/extraconfig.tcl"
|
||||
EXTRACT_NODEPLOY="ssh $DESTHOST $EXTRACT_CMDS; chown -R root:root /$DESTDIR; chown ${INSTRUMENT}_sics. /$DESTDIR/{DataNumber,newserver/config/nexus/nexus.dic}; chown ${INSTRUMENT}. /$DESTDIR/extraconfig.tcl"
|
||||
else
|
||||
EXTRACT="ssh $DESTHOST sg sics -c tar\ vxzp\ -C\ /"
|
||||
EXTRACT_NODEPLOY="ssh $DESTHOST sg sics -c \"tar\ vxzp\ -C\ /\""
|
||||
EXTRACT="ssh $DESTHOST $EXTRACT_CMDS"
|
||||
EXTRACT_NODEPLOY="ssh $DESTHOST $EXTRACT_CMDS"
|
||||
fi
|
||||
|
||||
if [ ! -e $SRCDIR/MANIFEST.TXT ]
|
||||
@@ -203,8 +200,8 @@ echo -e "The following files were installed by $USER\n" >> $TEMPDIR/$DESTDIR/new
|
||||
cat $SRCDIR/MANIFEST.TXT $SRCDIR/$INSTSRC/MANIFEST.TXT >> $TEMPDIR/$DESTDIR/newserver/MANIFEST.TXT
|
||||
|
||||
cd $TEMPDIR
|
||||
# remove any CVS directories
|
||||
rm -rf $(find $TARDIR -type d -name CVS)
|
||||
# remove any .svn directories
|
||||
rm -rf $(find $TARDIR -type d -name .svn)
|
||||
# remove any temporary editor files
|
||||
find $TARDIR -type f -name .\*.sw\? -exec rm {} \;
|
||||
# remove any editor backup files directories
|
||||
@@ -218,7 +215,12 @@ find $TARDIR -type d -exec chmod u+rwx,g+rwxs,o-w+rx {} \;
|
||||
# Strip leading / from DESTDIR and extract to destination
|
||||
if [[ "$DEPLOY" = "YES" ]]
|
||||
then
|
||||
tar -cz ${TARDIR}${EXEPATH} | $EXTRACT
|
||||
if [[ "$DESTHOST" = "localhost" ]]
|
||||
then
|
||||
eval "tar -cz ${TARDIR} | $EXTRACT"
|
||||
else
|
||||
tar -cz ${TARDIR} | $EXTRACT
|
||||
fi
|
||||
else
|
||||
echo "tar -cz -C $TEMPDIR $TARDIR${EXEPATH} | $EXTRACT_NODEPLOY"
|
||||
echo "tar -cz -C $TEMPDIR $TARDIR | $EXTRACT_NODEPLOY"
|
||||
fi
|
||||
|
||||
Reference in New Issue
Block a user