diff --git a/site_ansto/instrument/deploySICS.sh b/site_ansto/instrument/deploySICS.sh index 65373ce2..178fb205 100755 --- a/site_ansto/instrument/deploySICS.sh +++ b/site_ansto/instrument/deploySICS.sh @@ -1,8 +1,8 @@ #!/bin/sh -# $Revision: 1.14 $ -# $Date: 2006-11-16 05:20:51 $ +# $Revision: 1.15 $ +# $Date: 2006-11-21 01:35:13 $ # Author: Ferdi Franceschini (ffr@ansto.gov.au) -# Last revision by $Author: ffr $ +# Last revision by $Author: dcl $ # Deploys SICServer and configuration files to # an instrument control computer. @@ -105,7 +105,7 @@ if [ "$TESTING" = "test" ] then DESTHOST=${2:-ics1-test.nbi.ansto.gov.au} DESTDIR=${3:-/usr/local}/TEST_SICS/$INSTRUMENT - TARDIR=$DESTDIR + TARDIR=${DESTDIR:1} # remove and recreate the temporary directory rm -fr $TEMPDIR/$DESTDIR mkdir -p $TEMPDIR/$DESTDIR @@ -117,7 +117,7 @@ then mkdir -p $TEMPDIR/$DESTDIR else DESTDIR=${3:-/usr/local}/sics - TARDIR=$DESTDIR + TARDIR=${DESTDIR:1} # remove and recreate the temporary directory rm -fr $TEMPDIR/$DESTDIR mkdir -p $TEMPDIR/$DESTDIR @@ -128,9 +128,9 @@ echo "Deploying $INSTRUMENT to $DESTHOST:$DESTDIR" if [ "$DESTHOST" = "localhost" ] then -EXTRACT="tar vxz -C /" +EXTRACT="tar vxzp -C /" else -EXTRACT="ssh $DESTHOST sg sics -c tar\ vxz\ -C\ /" +EXTRACT="ssh $DESTHOST sg sics -c tar\ vxzp\ -C\ /" fi if [ ! -e $SRCDIR/MANIFEST.TXT ] @@ -152,8 +152,8 @@ 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) mkdir -p $TEMPDIR/$DESTDIR/{server,data,log,tmp} -cp $COMMON $INSTSPEC $TEMPDIR/$DESTDIR/server -cp ../SICServer $TEMPDIR/$DESTDIR/server +cp --preserve=timestamps $COMMON $INSTSPEC $TEMPDIR/$DESTDIR/server +cp --preserve=timestamps ../SICServer $TEMPDIR/$DESTDIR/server # Create a manifest of the files installed on the IC host echo "Date: $(date -Iminutes)" > $TEMPDIR/$DESTDIR/server/MANIFEST.TXT @@ -161,11 +161,14 @@ echo -e "The following files were installed by $USER\n" >> $TEMPDIR/$DESTDIR/ser cat $SRCDIR/MANIFEST.TXT $SRCDIR/$INSTSRC/MANIFEST.TXT >> $TEMPDIR/$DESTDIR/server/MANIFEST.TXT cd $TEMPDIR +find $TARDIR -type f -exec chmod u-s,g-x+wr,o-wx+r {} \; +find $TARDIR -type f -perm -100 -exec chmod go+x {} \; +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:1} | $EXTRACT + tar -cz $TARDIR | $EXTRACT else - echo "tar -cz ${TARDIR:1} | $EXTRACT" + echo "tar -cz $TARDIR | $EXTRACT" fi