From ffbec97ee1b821119646df0ddd696c6317b9fa4b Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Tue, 7 Jun 2016 11:18:38 +0100 Subject: Improve error handling of Vagrant installation. It should now show a failure message on failure, rather than always show the success message, and not show a confusing error about general.yml if something went wrong before creating that file. --- bin/install-as-user | 8 -------- bin/site-specific-install.sh | 12 +++++++----- 2 files changed, 7 insertions(+), 13 deletions(-) (limited to 'bin') diff --git a/bin/install-as-user b/bin/install-as-user index 502cf0e3e..2730fe404 100755 --- a/bin/install-as-user +++ b/bin/install-as-user @@ -30,14 +30,6 @@ DB_NAME="fixmystreet" # Check that the arguments we've been passed are sensible: -IP_ADDRESS_FOR_HOST="$(dig +short $HOST)" - -if [ x = x"$IP_ADDRESS_FOR_HOST" ] -then - error_msg "The hostname $HOST didn't resolve to an IP address" - exit 1 -fi - if ! id "$UNIX_USER" 2> /dev/null > /dev/null then error_msg "The user '$UNIX_USER' didn't exist." diff --git a/bin/site-specific-install.sh b/bin/site-specific-install.sh index 71bfc11ff..251c70e81 100644 --- a/bin/site-specific-install.sh +++ b/bin/site-specific-install.sh @@ -61,9 +61,11 @@ then overwrite_rc_local fi -# Tell the user what to do next: +if [ ! "$DEVELOPMENT_INSTALL" = true ]; then + # Tell the user what to do next: -echo Installation complete - you should now be able to view the site at: -echo http://$HOST/ -echo Or you can run the tests by switching to the "'$UNIX_USER'" user and -echo running: $REPOSITORY/bin/run-tests t + echo Installation complete - you should now be able to view the site at: + echo http://$HOST/ + echo Or you can run the tests by switching to the "'$UNIX_USER'" user and + echo running: $REPOSITORY/bin/run-tests t +fi -- cgit v1.2.3