diff --git a/Repositories/otago_eprints3/Makefile b/Repositories/otago_eprints3/Makefile index 4e92a20..ce9e3e1 100755 --- a/Repositories/otago_eprints3/Makefile +++ b/Repositories/otago_eprints3/Makefile @@ -10,7 +10,6 @@ # EPRINTS_GROUP: the group that owns the EPrints directory # APACHE_STOP: the command to stop Apache # APACHE_START: the command to start Apache -# APACHE_PID: the path to the Apache PID file # # Used in archive XML configuration files # EPRINTS_HOST: eprints host name @@ -27,6 +26,9 @@ # EPRINTSSTATS: /path/to/EPrintsStats/installation # PHPSURVEYOR: /path/to/phpSurveyor/installation (deprecated) # +# Required commands: +# pgrep +# include environment_config.make @@ -106,10 +108,10 @@ restart_apache: @announce "Waiting for Apache to shut down..." @sudo $(APACHE_STOP) - @sleep 10 + @while `pgrep "apache|httpd" > /dev/null`; do echo > /dev/null; done @announce "Waiting for Apache to start up..." @sudo $(APACHE_START) - @while [ ! -f $(APACHE_PID) ]; do echo > /dev/null; done + @until `pgrep "apache|httpd" > /dev/null`; do echo > /dev/null; done index: