From: Andre Date: Thu, 9 Mar 2006 15:34:51 +0000 (+0100) Subject: Convert demo-script to the new syntax without colons. X-Git-Tag: v0.2.11~33^2 X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=a2a83ea6614aeb78ec07b3cebd06abcfae418109;hp=0439c3cd92853db1979001d46f8b8665bf0b31f8 Convert demo-script to the new syntax without colons. As this won't work with paraslash-0.2.10, change the script to download the git tarball. --- diff --git a/scripts/demo-script b/scripts/demo-script index 003aa7b0..9e12e803 100755 --- a/scripts/demo-script +++ b/scripts/demo-script @@ -6,15 +6,15 @@ dir="$HOME/.paraslash" client_conf="$dir/client.conf" audioc_conf="$dir/audioc.conf" server=www.paraslash.org -proj=paraslash-0.2.10 +proj=paraslash-git df=$proj.tar.bz2 # download file url=http://$server/versions/$df kf="$dir/key.anonymous" # key file key_url=http://$server/key.anonymous socket="$dir/socket" -receiver_opts="mp3:http:-i:$server:-p:8009" +receiver_opts="mp3:http -i $server -p 8009" audiod_log="$dir/audiod.log" -audiod_opts="-FDdr $receiver_opts -L $audiod_log -s $socket" +audiod_opts="-FDd -L $audiod_log -s $socket" msg() { echo "`date`: $1" @@ -46,8 +46,8 @@ EOF msg "writing $audioc_conf" echo "socket \"$socket\"" > "$audioc_conf" (para_audioc term; killall para_audiod para_client) >> "$log" 2>&1 - msg "para_audiod $audiod_opts" - para_audiod $audiod_opts -w "mp3:mpg123 -" + msg "para_audiod $audiod_opts -r '$receiver_opts'" + para_audiod $audiod_opts -r "$receiver_opts" -w "mp3:mpg123 -" echo "hit return to start para_gui, hit ctrl+c to abort" read para_gui