From: Andre Noll <maan@congo.fml.local>
Date: Tue, 10 Oct 2006 16:35:46 +0000 (+0200)
Subject: nuke the demo-script
X-Git-Tag: v0.2.14~2^2~2
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=1c9220bc80c65cd8a9f8e942d8abb36c6120e487

nuke the demo-script

It was broken at least since paraslash-0.2.13. Update the live demo
page accordingly.
---

diff --git a/scripts/demo-script b/scripts/demo-script
deleted file mode 100755
index a6e29fc0..00000000
--- a/scripts/demo-script
+++ /dev/null
@@ -1,56 +0,0 @@
-#!/bin/bash
-
-bin="para_client para_audioc para_audiod para_gui" # the binaries we need
-log="`pwd`/demo-log.$$.log"
-dir="$HOME/.paraslash"
-client_conf="$dir/client.conf"
-audioc_conf="$dir/audioc.conf"
-server=www.paraslash.org
-proj=paraslash-0.2.13
-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"
-audiod_log="$dir/audiod.log"
-audiod_opts="-FDd -L $audiod_log -s $socket"
-msg()
-{
-	echo "`date`: $1"
-}
-
-go()
-{
-	msg "downloading $df"
-	wget -N -q $url || return 1
-	msg "decompressing"
-	rm -rf $proj; tar xjf $df
-	cd $proj || return 1
-	msg "configuring (be patient, ignore warnings but not errors)"
-	./configure --prefix "$HOME" >> "$log"
-	msg "building $bin"
-	make $bin >> "$log"
-	msg "installing"
-	mkdir -p $HOME/bin && install -c -s -m 755 $bin $HOME/bin || return 1
-	export PATH=$HOME/bin:$PATH
-	msg "retrieving anonymous key"
-	mkdir -p $dir || return 1
-	wget -q --directory-prefix=$dir $key_url || return 1
-	msg "writing $client_conf"
-	cat << EOF > "$client_conf"
-		user "anonymous"
-		hostname "$server"
-		key_file "$kf"
-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 -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
-}
-
-go
diff --git a/web/demo.in.html b/web/demo.in.html
index 17ab21a8..1306c3c2 100644
--- a/web/demo.in.html
+++ b/web/demo.in.html
@@ -8,22 +8,45 @@ streaming
 
 
 You can listen to the stream with any mp3 player that supports
-http streaming. Both </p>
+http streaming.</p>
 
 	<p>mpg123 -Z http://www.paraslash.org:8009/</p>
 
-and
 
 	<p>xmms http://www.paraslash.org:8009/</p>
 
-<p> are known to work.</p>
-
-<p> Moreover, there is an anonymous paraslash account
-available which you can use to have a look at paraslash
-without configuring and running para_server on your own box.
-Just download and run
-
-	<a href="demo-script">this shell script</a>
-
-on your Unix system.  No root-privileges are required.</p>
-
+<p>and iTunes are known to work.</p>
+
+<p> Moreover, there is an anonymous paraslash account available which you can
+use to have a look at paraslash without configuring and running para_server on
+your own box. There's no need to install the paraslash package and no
+root-privileges are required for the demo. </p>
+
+<p>Download the
+
+	<a href="key.anonymous">public key</a>
+
+for the anonymous user and the latest paraslash
+
+	<a href="versions">tarball</a>
+or the
+	<a href="versions/paraslash-git.tar.bz2">current snapshot</a>.
+
+Next, compile para_audiod (./configure && make para_audiod) and use the
+following configuration options:</p>
+<ul>
+	<li> ~/.paraslash/client.conf:
+	<ul>
+		<li>user anonymous</li>
+		<li>hostname www.paraslash.org</li>
+		<li>key_file key.anonymous</li>
+	</ul>
+	<li> ~/.paraslash/audiod.conf:</li>
+	<ul>
+		<li>receiver "mp3:http -i www.paraslash.org -p 8009"</li>
+		<li>loglevel 1</li>
+	</ul>
+</ul>
+<p>Finally, type "./para_audiod" to start streaming. If this works, try out
+para_client, para_gui and para_audioc. Otherwise, use para_recv, para_filter
+and para_write to find out why.</p>