diff --git a/.gitignore b/.gitignore index a452371f..49b99919 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ SICServer made_config.h +PATCH.TXT *.aux *.pdf *.sw[op] diff --git a/site_ansto/extract_version.sh b/site_ansto/extract_version.sh index 0f6b1d3a..70ecd81e 100755 --- a/site_ansto/extract_version.sh +++ b/site_ansto/extract_version.sh @@ -45,6 +45,9 @@ else if [[ ${SICS_PLUS} > 0 ]] then SICS_REV="${SICS_REV}+${SICS_PLUS}" + git diff > PATCH.TXT + else + rm PATCH.TXT fi unset SICS_PLUS else diff --git a/site_ansto/instrument/deploySICS.sh b/site_ansto/instrument/deploySICS.sh index 1d26b95d..e2fffe72 100755 --- a/site_ansto/instrument/deploySICS.sh +++ b/site_ansto/instrument/deploySICS.sh @@ -241,6 +241,10 @@ echo "Date: $(date -Iminutes)" > $TEMPDIR/$DESTDIR/${NEWSERVER}/DEPLOYMENT.TXT echo "User: $USER" >> $TEMPDIR/$DESTDIR/${NEWSERVER}/DEPLOYMENT.TXT DEPLOYED_VERSION="$(bash ../extract_version.sh all)" echo "Version:" $DEPLOYED_VERSION >> $TEMPDIR/$DESTDIR/${NEWSERVER}/DEPLOYMENT.TXT +if [ -e PATCH.TXT ] +then +cat PATCH.TXT > $TEMPDIR/$DESTDIR/${NEWSERVER}/PATCH.TXT +fi cat $SRCDIR/MANIFEST.TXT $SRCDIR/$INSTSRC/MANIFEST.TXT > $TEMPDIR/$DESTDIR/${NEWSERVER}/MANIFEST.TXT cd $TEMPDIR