X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/ce195bb5900c00fb890625642659bdf71b6d0d57..026a72d4f3e7d69c31c9523aa08554d159e21e1a:/scripts/setup.in

diff --git a/scripts/setup.in b/scripts/setup.in
index 803b0ae..3bc0b45 100755
--- a/scripts/setup.in
+++ b/scripts/setup.in
@@ -21,6 +21,79 @@
 
 set -e
 
+while [ $# -gt 0 ]; do
+  opt="$1"
+  shift
+  case "$opt" in
+  -h | --help )
+    cat  <<EOF
+
+Usage:
+  scripts/setup [OPTIONS]
+
+Options:
+  --root ROOT             Add a root (can be used multiple times)
+  --encoding ENCODING     Filename encoding
+  --port PORT             TCP port to listen on or 'none'
+  --smtp-server HOSTNAME  SMTP server
+  --email ADDRESS         Origin email address
+  --register y|n          Enable/disable online registration
+  --play local|network    Choose local or network play
+  --mcast ADDRESS PORT    Set multicast address and port for --play network
+  -h, --help              Display this message
+
+Sets up a basic DisOrder installation.  You must have run 'make install'
+first.  Use scripts/teardown to stop the server and deconfigure.
+
+EOF
+    exit 0
+    ;;
+  --version | -V )
+    echo "DisOrder scripts/setup _version_"
+    exit 0
+    ;;
+  --root )
+    roots="$roots $1"
+    shift
+    ;;
+  --encoding )
+    encoding="$1"
+    shift
+    ;;
+  --port )
+    port="$1"
+    shift
+    ;;
+  --smtp-server )
+    smtp_server="$1"
+    shift
+    ;;
+  --email )
+    mail_sender="$1"
+    shift
+    ;;
+  --register )
+    register="$1"
+    shift
+    ;;
+  --play )
+    play="$1"
+    shift
+    ;;
+  --mcast )
+    play=network
+    mcast_address="$1"
+    shift
+    mcast_port="$1"
+    shift
+    ;;
+  * )
+    echo >&2 "ERROR: unknown option '$opt'"
+    exit 1
+    ;;
+  esac
+done
+
 echo
 echo ------------------------------------------------------------------------
 echo "DisOrder setup script"
@@ -64,32 +137,31 @@ 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 ------------------------------------------------------------------------
 
-while :; do
-  echo
-  echo "What directory or directories contain your music files:"
-  echo "(enter one or more directories separated by spaces)"
-  read -r roots
-  ok=true
-  for root in $roots; do
-    if [ ! -d $root ]; then
-      echo "'$root' does not exist"
-      ok=false
+if [ -z "$roots" ]; then
+  while :; do
+    echo
+    echo "What directory or directories contain your music files:"
+    echo "(enter one or more directories separated by spaces)"
+    read -r roots
+    ok=true
+    for root in $roots; do
+      if [ ! -d $root ]; then
+	echo "'$root' does not exist"
+	ok=false
+      fi
+    done
+    if $ok; then
+      break
     fi
   done
-  if $ok; then
-    break
-  fi
-done
+fi
 
 if [ -z "$encoding" ]; then
   echo 
@@ -98,42 +170,107 @@ if [ -z "$encoding" ]; then
   read -r encoding
 fi
 
-while :; do
-  echo
-  echo "What TCP port should DisOrder listen on?"
-  echo "(enter 'none' for none)"
-  read -r port
-  case $port in
-  none )
-    break
-    ;;
-  [^0-9] )
-    echo "'$port' is not a valid port number"
-    continue
-    ;;
-  * )
-    break
-    ;;
-  esac
-done
+if [ -z "$port" ]; then
+  while :; do
+    echo
+    echo "What TCP port should DisOrder listen on?"
+    echo "(enter 'none' for none)"
+    read -r port
+    case $port in
+    none )
+      break
+      ;;
+    [^0-9] )
+      echo "'$port' is not a valid port number"
+      continue
+      ;;
+    * )
+      break
+      ;;
+    esac
+  done
+fi
 
-echo
-echo "What host should DisOrder use as an SMTP server?"
-read -r smtp_server
+if [ -z "$play" ]; then
+  while :; do
+    echo
+    echo "How do you want to play sound?  Enter 'local' to use a local sound"
+    echo "device or 'network' to multicast sound across your network."
+    read -r play
+    case $play in
+    'local' | network )
+      break
+      ;;
+    * )
+      echo "Enter 'local' or 'network'"
+      continue
+      ;;
+    esac
+  done
+fi
+
+if [ "x$play" = xnetwork ]; then
+  if [ -z "$mcast_address" ]; then
+    echo
+    echo "Enter destination address for network transmission"
+    echo "(e.g. a multicast address)"
+    read -r mcast_address
+  fi
+  if [ -z "$mcast_port" ]; then
+    while :; do
+      echo
+      echo "Enter destination port for network transmission"
+      read -r mcast_port
+      case $mcast_port in
+      none )
+	break
+	;;
+      [^0-9] )
+	echo "'$mcast_port' is not a valid port number"
+	continue
+	;;
+      * )
+	break
+	;;
+      esac
+    done
+  fi
+fi
 
-while :; do
+if [ -z "$smtp_server" ]; then
   echo
-  echo "What address should mail from DisOrder come from?"
-  read -r mail_sender
-  case "$mail_sender" in
-  *@* )
-    break
-    ;;
-  * )
-    echo "Email address must contain an '@' sign"
-    ;;
-  esac
-done
+  echo "What host should DisOrder use as an SMTP server?"
+  read -r smtp_server
+fi
+
+if [ -z "$mail_sender" ]; then
+  while :; do
+    echo
+    echo "What address should mail from DisOrder come from?"
+    read -r mail_sender
+    case "$mail_sender" in
+    *@* )
+      break
+      ;;
+    * )
+      echo "Email address must contain an '@' sign"
+      ;;
+    esac
+  done
+fi
+
+if [ -z "$register" ]; then
+  while :; do
+    echo
+    echo "Do you want to enable online registration?  (Enter 'y' or 'n')"
+    read -r register
+    case $reguser in
+    y | n )
+      break
+      ;;
+    esac
+  done
+fi
 
 echo
 echo "Proposed DisOrder setup:"
@@ -145,6 +282,10 @@ else
 fi
 echo " SMTP Server:           $smtp_server"
 echo " Sender address:        $mail_sender"
+echo " Online registration:   $register"
+if [ $play = network ]; then
+  echo " Send sound to:         $mcast_address port $mcast_port"
+fi
 
 echo "Is this OK?  (Enter 'y' or 'n')"
 read -r ok
@@ -171,6 +312,9 @@ echo "user $user" >> pkgconfdir/config.new
 if [ $port != none ]; then
   echo "listen 0.0.0.0 $port" >> pkgconfdir/config.new
 fi
+if [ $play = network ]; then
+  echo "broadcast $mcast_address $mcast_port" >> pkgconfdir/config.new
+fi
 echo "smtp_server $smtp_server" >> pkgconfdir/config.new
 echo "mail_sender $mail_sender" >> pkgconfdir/config.new
 
@@ -223,32 +367,32 @@ pick() {
 case $os in
 Mac )
   # Apple don't seem to believe in creating a user as a discrete operation
-  if dscl / -read /Groups/$group >/dev/null 2>&1; then
+  if dscl . -read /Groups/$group >/dev/null 2>&1; then
     echo "$group group already exists"
   else
     echo "Creating $group group"
-    gids=$(dscl / -list /Groups PrimaryGroupID|awk '{print $2}')
+    gids=$(dscl . -list /Groups PrimaryGroupID|awk '{print $2}')
     gid=$(pick $gids)
     echo "(picked gid $gid)"
-    dscl / -create /Groups/$group
-    dscl / -create /Groups/$group PrimaryGroupID $gid
-    dscl / -create /Groups/$group Password \*
+    dscl . -create /Groups/$group
+    dscl . -create /Groups/$group PrimaryGroupID $gid
+    dscl . -create /Groups/$group Password \*
   fi
-  if dscl / -read /Users/$user >/dev/null 2>&1; then
+  if dscl . -read /Users/$user >/dev/null 2>&1; then
     echo "$user user already exists"
   else
     echo "Creating $user user"
-    uids=$(dscl / -list /Users UniqueID|awk '{print $2}')
+    uids=$(dscl . -list /Users UniqueID|awk '{print $2}')
     uid=$(pick $uids)
     echo "(picked uid $uid)"
-    gid=$(dscl / -read /Groups/$group PrimaryGroupID | awk '{print $2}')
-    dscl / -create /Users/$user
-    dscl / -create /Users/$user UniqueID $uid
-    dscl / -create /Users/$user UserShell /usr/bin/false
-    dscl / -create /Users/$user RealName 'DisOrder server'
-    dscl / -create /Users/$user NFSHomeDirectory pkgstatedir
-    dscl / -create /Users/$user PrimaryGroupID $gid
-    dscl / -create /Users/$user Password \*
+    gid=$(dscl . -read /Groups/$group PrimaryGroupID | awk '{print $2}')
+    dscl . -create /Users/$user
+    dscl . -create /Users/$user UniqueID $uid
+    dscl . -create /Users/$user UserShell /usr/bin/false
+    dscl . -create /Users/$user RealName 'DisOrder server'
+    dscl . -create /Users/$user NFSHomeDirectory pkgstatedir
+    dscl . -create /Users/$user PrimaryGroupID $gid
+    dscl . -create /Users/$user Password \*
   fi
   ;;
 FreeBSD )
@@ -396,18 +540,16 @@ else
 fi
 
 if $server_running; then
-  while :; do
-    echo
-    echo "Do you want to enable online registration?  (Enter 'y' or 'n')"
-    read -r reg
-    case $reg in
-    y | n )
-      break
-      ;;
-    esac
+  first=true
+  sleep 5
+  while ! disorder version >/dev/null 2>&1; do
+    if $first; then
+      echo "Waiting for server startup to complete..."
+      first=false
+    fi
+    sleep 1
   done
-  echo
-  if [ $reg = y ]; then
+  if [ $register = y ]; then
     echo "Creating guest user with 'register' right"
     disorder setup-guest
   else