scripts/setup now waits until the server has started up before

attempting to setup-guest.

diff --git a/scripts/setup.in b/scripts/setup.in
index 803b0ae1c9fd4c28cef8d7911995ca16d3b67ebf..bf47f248dda058f6e183449db66a58bc9a4fab2e 100755 (executable)
--- 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