Changeset 5513:9bbb23a56bc8 in roaraudio for dist/debian-like/roaraudio

Timestamp:

05/28/12 15:12:39 (12 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

Updated debian init script (Closes: #183)

File:

• dist/debian-like/roaraudio (modified) (6 diffs)

dist/debian-like/roaraudio

@@ -3 +3 @@
 # roaraudio initscript
 #
-# Copyright (c) 2008-2010 Philipp 'ph3-der-loewe' Schafft <lion@lion.leolix.org>
+# Copyright (c) 2008-2012 Philipp 'ph3-der-loewe' Schafft <lion@lion.leolix.org>
 # Copyright (c)      2007 Javier Fernandez-Sanguino <jfs@debian.org>
 #
@@ -77 +77 @@
 [ "$ROARD_DESCRIPTION" = ''    ] || ROARD_OPTS="--description '$ROARD_DESCRIPTION' $ROARD_OPTS"
 
+[ "$ROARD_CONTACT"     = ''    ] || ROARD_OPTS="--contact '$ROARD_CONTACT' $ROARD_OPTS"
+[ "$ROARD_SERIAL"      = ''    ] || ROARD_OPTS="--serial '$ROARD_SERIAL' $ROARD_OPTS"
+[ "$ROARD_UIURL"       = ''    ] || ROARD_OPTS="--uiurl '$ROARD_UIURL' $ROARD_OPTS"
+
+[ "$ROARD_SOCKET" = '' ]  || ROARD_OPTS="--sock $ROARD_SOCKET $ROARD_OPTS"
+[ "$ROARD_PORT"   = '' ]  || ROARD_OPTS="--port $ROARD_PORT $ROARD_OPTS"
+
+if [ "$ROARD_OBJECT" = '' ]
+then
+ [ "$ROARD_HOST" = '' ]   || ROARD_OPTS="--bind $ROARD_HOST $ROARD_OPTS"
+else
+ ROARD_OPTS="--sock $ROARD_HOST::$ROARD_OBJECT $ROARD_OPTS"
+fi
+
 case "$ROARD_AF" in
   UNIX|unix)
@@ -120 +134 @@
 esac
 
-[ "$ROARD_SOCKET" = '' ]  || ROARD_OPTS="--sock $ROARD_SOCKET $ROARD_OPTS"
-[ "$ROARD_PORT"   = '' ]  || ROARD_OPTS="--port $ROARD_PORT $ROARD_OPTS"
-
-if [ "$ROARD_OBJECT" = '' ]
-then
- [ "$ROARD_HOST" = '' ]   || ROARD_OPTS="--bind $ROARD_HOST $ROARD_OPTS"
-else
- ROARD_OPTS="--sock $ROARD_HOST::$ROARD_OBJECT $ROARD_OPTS"
+if [ "$ROARD_PROFILES" != '' ]
+then
+ _p=`echo "$ROARD_PROFILES" | sed 's/  */ --new-sock --proto-profile /g'`
+ ROARD_OPTS="$ROARD_OPTS --new-sock --proto-profile $_p"
 fi
 
@@ -136 +146 @@
 [ "$ROARD_BITS"    = '' ] || ROARD_OPTS="-B $ROARD_BITS $ROARD_OPTS"
 
+[ "$ROARD_AIPROFILE" = '' ] || ROARD_OPTS="--aiprofile $ROARD_AIPROFILE $ROARD_OPTS"
+
 [ "$ROARD_DRIVER" = '' ]  || ROARD_OPTS="-o $ROARD_DRIVER $ROARD_OPTS"
 [ "$ROARD_DEVICE" = '' ]  || ROARD_OPTS="-O $ROARD_DEVICE $ROARD_OPTS"
-[ "$ROARD_DRIVER_OPTIONS" = '' ] && ROARD_DRIVER_OPTIONS='sync'
+[ "$ROARD_DRIVER_OPTIONS" = '' ] && ROARD_DRIVER_OPTIONS='sync,autoconf'
 ROARD_OPTS="-oP -oO $ROARD_DRIVER_OPTIONS $ROARD_OPTS"
 
@@ -150 +162 @@
 do
  ROARD_OPTS="--rolestack-push $_p $ROARD_OPTS"
+done
+
+for _p in $ROARD_PLUGINS
+do
+ ROARD_OPTS="--plugin-load $_p $ROARD_OPTS"
 done
 
@@ -195 +212 @@
 
 ROARD_OPTS="$ROARD_OPTS $ESD_OPTS $RSOUND_OPTS"
-
-if [ "$ROARD_PROFILES" != '' ]
-then
- _p=`echo "$ROARD_PROFILES" | sed 's/  */ --new-sock --proto-profile /g'`
- ROARD_OPTS="$ROARD_OPTS --new-sock --proto-profile $_p"
-fi
 
 for _p in $CHOWN_LIST