From 1a8b03f30d8fe8ecb5ee86e76f052c53afffe3f3 Mon Sep 17 00:00:00 2001 Message-Id: <1a8b03f30d8fe8ecb5ee86e76f052c53afffe3f3.1714911809.git.mdw@distorted.org.uk> From: Mark Wooding Date: Sat, 19 Jan 2008 12:28:31 +0000 Subject: [PATCH] scripts/setup now waits until the server has started up before attempting to setup-guest. Organization: Straylight/Edgeware From: Richard Kettlewell --- scripts/setup.in | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/scripts/setup.in b/scripts/setup.in index 803b0ae..bf47f24 100755 --- a/scripts/setup.in +++ b/scripts/setup.in @@ -64,12 +64,9 @@ esac echo echo "This script will:" echo " - overwrite any existing configuration" -case $os in -Mac ) - echo " - set the server up to be run at boot time" - echo " - start the server" - ;; -esac +echo " - set the server up to be run at boot time" +echo " - start the server" +echo " - set up the web interface" echo echo "If this is not what you want, press ^C." echo ------------------------------------------------------------------------ @@ -407,6 +404,14 @@ if $server_running; then esac done echo + first=true + while ! disorder version >/dev/null 2>&1; do + if $first; then + echo "Waiting for server startup to complete..." + first=false + fi + sleep 1 + done if [ $reg = y ]; then echo "Creating guest user with 'register' right" disorder setup-guest -- [mdw]