diff --git a/Repositories/otago_eprints/Makefile b/Repositories/otago_eprints/Makefile index f211d88..9f39cc0 100755 --- a/Repositories/otago_eprints/Makefile +++ b/Repositories/otago_eprints/Makefile @@ -13,29 +13,34 @@ deploy: - @sudo rsync --verbose --cvs-exclude --exclude=Makefile --recursive \ - --times --delete --delete-excluded . $(EPRINTS)/archives > rsync-output + @announce "Copying files..." + @sudo rsync --verbose --cvs-exclude --exclude=Makefile \ + --recursive --times . $(EPRINTS)/archives > .del-rsync-output + @-grep $(ARCHIVE_NAME) .del-rsync-output + @announce "Correcting ownership..." sudo chown -R www:www $(ARCHIVE_CONFIG) $(ARCHIVE_ROOT) - @-grep --quiet "$(ARCHIVE_NAME)\\.xml" rsync-output && $(MAKE) generate_apacheconf - @-grep --quiet "$(ARCHIVE_NAME)/cfg/subjects" rsync-output && $(MAKE) import_subjects - @-grep --quiet "\\(otago_eprints/cfg/static/\\)\\|\\(\\.xml\\)" rsync-output && $(MAKE) generate_static - @-grep --quiet "\\(\\.pm\\)\\|\\(\\.xml\\)\|\($(ARCHIVE_NAME)/cfg/subjects\)" rsync-output && $(MAKE) generate_views - @-grep --quiet "$(ARCHIVE_NAME)/cfg/ArchiveRenderConfig.pm" rsync-output && $(MAKE) generate_abstracts - @-grep --quiet "\\(\\.pm\\)\\|\\(\\.xml\\)" rsync-output && $(MAKE) restart_apache - @rm -f rsync-output + @-grep --quiet "$(ARCHIVE_NAME)\\.xml" .del-rsync-output && $(MAKE) generate_apacheconf + @-grep --quiet "$(ARCHIVE_NAME)/cfg/subjects" .del-rsync-output && $(MAKE) import_subjects + @-grep --quiet "\\(otago_eprints/cfg/static/\\)\\|\\(\\.xml\\)" .del-rsync-output && $(MAKE) generate_static + @-grep --quiet "\\(\\.pm\\)\\|\\(\\.xml\\)\|\($(ARCHIVE_NAME)/cfg/subjects\)" .del-rsync-output && $(MAKE) generate_views + @-grep --quiet "$(ARCHIVE_NAME)/cfg/ArchiveRenderConfig.pm" .del-rsync-output && $(MAKE) generate_abstracts + @-grep --quiet "\\(\\.pm\\)\\|\\(\\.xml\\)" .del-rsync-output && $(MAKE) restart_apache + @rm -f .del-rsync-output generate_apacheconf: + @announce "generate_apacheconf" @sudo -u www $(BINDIR)/$@ import_subjects generate_static generate_abstracts generate_views: + @announce "$@ $(ARCHIVE_NAME)" @sudo -u www $(BINDIR)/$@ $(ARCHIVE_NAME) restart_apache: - @echo "Waiting for Apache to shut down..." + @announce "Waiting for Apache to shut down..." @sudo /usr/sbin/apachectl stop @while [ -f /var/run/httpd.pid ]; do echo > /dev/null; done - @echo "Waiting for Apache to start up..." + @announce "Waiting for Apache to start up..." @sudo /usr/sbin/apachectl start @while [ ! -f /var/run/httpd.pid ]; do echo > /dev/null; done