--- Install.orig	Fri May 27 18:55:01 2005
+++ Install	Wed Jan 10 01:05:07 2007
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 # Install script for the Darwin Streaming Server
 # source release
@@ -16,6 +16,7 @@
 
 if [ $USERID = 0 ]; then
 
+if false; then
 	echo Checking for and Killing currently running Darwin Streaming Server
 	if [ `uname` = "FreeBSD" ]; then
 		ps -ax | awk '/DarwinStreamingServer/ {print $1}' | xargs kill -9  
@@ -113,6 +114,7 @@
 	fi
 
 	echo
+fi
 
 ## CHANGE PERL PATH IN streamingadminserver.pl AND parse_xml.cgi ##
 
@@ -207,29 +209,29 @@
     fi              
 
 	echo copying "DarwinStreamingServer" to "/usr/local/sbin/DarwinStreamingServer"
-	cp -f DarwinStreamingServer /usr/local/sbin/
+	${BSD_INSTALL_PROGRAM} DarwinStreamingServer /usr/local/sbin/
 	
 	
 	echo copying "PlaylistBroadcaster" to "/usr/local/bin/PlaylistBroadcaster"
-	cp -f PlaylistBroadcaster /usr/local/bin/
+	${BSD_INSTALL_PROGRAM} PlaylistBroadcaster /usr/local/bin/
 	
 	echo copying "MP3Broadcaster" to "/usr/local/bin/MP3Broadcaster"
-	cp -f MP3Broadcaster /usr/local/bin/
+	${BSD_INSTALL_PROGRAM} MP3Broadcaster /usr/local/bin/
 	
 	echo copying "qtpasswd" to "/usr/local/bin/qtpasswd"
-	cp -f qtpasswd /usr/local/bin/
+	${BSD_INSTALL_PROGRAM} qtpasswd /usr/local/bin/
 
 	# For now, do not copy modules as there are no supported dynamic modules
 	# echo copying modules to "/usr/local/sbin/StreamingServerModules"
-	if [ ! -d /usr/local/sbin/StreamingServerModules ]; then
-		echo creating "/usr/local/sbin/StreamingServerModules" directory
-		mkdir /usr/local/sbin/StreamingServerModules
+	if [ ! -d /usr/local/libexec/StreamingServerModules ]; then
+		echo creating "/usr/local/libexec/StreamingServerModules" directory
+		mkdir /usr/local/libexec/StreamingServerModules
 	fi
-	cp -f StreamingServerModules/* /usr/local/sbin/StreamingServerModules/
+	${BSD_INSTALL_PROGRAM} StreamingServerModules/* /usr/local/libexec/StreamingServerModules/
 
-	if [ -e /usr/local/sbin/StreamingServerModules/QTSSHomeDirectoryModule ]; then
+	if [ -e /usr/local/libexec/StreamingServerModules/QTSSHomeDirectoryModule ]; then
 		echo copying "createuserstreamingdir" to "/usr/local/bin/createuserstreamingdir"
-		cp -f createuserstreamingdir $INSTALLROOT/usr/local/bin/
+		${BSD_INSTALL_PROGRAM} createuserstreamingdir $INSTALLROOT/usr/local/bin/
 	fi
 	
 	if [ ! -d /etc/streaming ]; then
@@ -237,44 +239,53 @@
 		mkdir -p /etc/streaming
 	fi
 	
+	echo copying "streamingserver.xml" to "/etc/streaming/streamingserver.xml-dist"
+	${BSD_INSTALL_DATA} streamingserver.xml /etc/streaming/streamingserver.xml-dist
 	if [ ! -e /etc/streaming/streamingserver.xml ]; then
+		echo;echo copying "streamingserver.xml" to "/etc/streaming/streamingserver.xml"
+		${BSD_INSTALL_DATA} streamingserver.xml /etc/streaming/streamingserver.xml
+if false; then
 		/usr/local/sbin/DarwinStreamingServer -x
+fi
 	fi
 	
 	chmod 600 /etc/streaming/streamingserver.xml
 	chown qtss /etc/streaming/streamingserver.xml
 	
-	echo;echo copying "relayconfig.xml-Sample" to "/etc/streaming/relayconfig.xml-Sample"
-	cp -f relayconfig.xml-Sample /etc/streaming/relayconfig.xml-Sample
-	chmod 600 /etc/streaming/relayconfig.xml-Sample
-	if [ -e /etc/streaming/relayconfig.xml ]; then
+	echo;echo copying "relayconfig.xml-Sample" to "/etc/streaming/relayconfig.xml-dist"
+	${BSD_INSTALL_DATA} relayconfig.xml-Sample /etc/streaming/relayconfig.xml-dist
+	chmod 600 /etc/streaming/relayconfig.xml-dist
+	if [ ! -e /etc/streaming/relayconfig.xml ]; then
+		echo;echo copying "relayconfig.xml-Sample" to "/etc/streaming/relayconfig.xml"
+		${BSD_INSTALL_DATA} relayconfig.xml-Sample /etc/streaming/relayconfig.xml
 		chown qtss /etc/streaming/relayconfig.xml
+		chmod 600 /etc/streaming/relayconfig.xml
 	fi
 	
-	echo;echo copying "qtusers" to "/etc/streaming/qtusers"
-	cp -f qtusers /etc/streaming/qtusers
-	chmod 600 /etc/streaming/qtusers
-	chown qtss /etc/streaming/qtusers
-
-	echo;echo copying "qtgroups" to "/etc/streaming/qtgroups"
-	cp -f qtgroups /etc/streaming/qtgroups
-	chmod 600 /etc/streaming/qtgroups
-	chown qtss /etc/streaming/qtgroups
+	echo;echo copying "qtusers" to "/etc/streaming/qtusers-dist"
+	${BSD_INSTALL_DATA} qtusers /etc/streaming/qtusers-dist
+	chmod 600 /etc/streaming/qtusers-dist
+	chown qtss /etc/streaming/qtusers-dist
+
+	echo;echo copying "qtgroups" to "/etc/streaming/qtgroups-dist"
+	${BSD_INSTALL_DATA} qtgroups /etc/streaming/qtgroups-dist
+	chmod 600 /etc/streaming/qtgroups-dist
+	chown qtss /etc/streaming/qtgroups-dist
 
 	#echo;echo copying "streamingadminserver.pem" to "/etc/streaming/streamingadminserver.pem"
-	#cp -f streamingadminserver.pem /etc/streaming/streamingadminserver.pem
+	#${BSD_INSTALL_DATA} streamingadminserver.pem /etc/streaming/streamingadminserver.pem
 	#chmod 400 /etc/streaming/streamingadminserver.pem
 
-	if [ ! -d /var/streaming ]; then
-		echo creating "/var/streaming" directory
-		mkdir -p /var/streaming
+	if [ ! -d ${DATADIR} ]; then
+		echo creating "${DATADIR}" directory
+		mkdir -p ${DATADIR}
 	fi
 	
-	echo copying "readme.txt" to "/var/streaming/readme.txt"
-	cp -f readme.txt /var/streaming/readme.txt
+	echo copying "readme.txt" to "${DATADIR}/readme.txt"
+	${BSD_INSTALL_DATA} readme.txt ${DATADIR}/readme.txt
 	
-	echo copying "3rdPartyAcknowledgements.rtf" to "/var/streaming/3rdPartyAcknowledgements.rtf"
-	cp -f 3rdPartyAcknowledgements.rtf /var/streaming/3rdPartyAcknowledgements.rtf
+	echo copying "3rdPartyAcknowledgements.rtf" to "${DATADIR}/3rdPartyAcknowledgements.rtf"
+	${BSD_INSTALL_DATA} 3rdPartyAcknowledgements.rtf ${DATADIR}/3rdPartyAcknowledgements.rtf
 	
 	if [ ! -d /var/streaming/logs ]; then
 		echo creating "/var/streaming/logs" directory
@@ -290,70 +301,72 @@
 		echo creating "/var/streaming/playlists" directory
 		mkdir -p /var/streaming/playlists
 	fi
+	chown -Rh qtss:qtss /var/streaming/playlists
 	chmod 770 /var/streaming/playlists
 	chmod 775 /usr/local/movies
 	
     echo copying "sample_100kbit.mov" into "/usr/local/movies/sample_100kbit.mov"
-    cp -f sample_100kbit.mov /usr/local/movies/
+    ${BSD_INSTALL_DATA} sample_100kbit.mov /usr/local/movies/
 
     echo copying "sample_300kbit.mov" into "/usr/local/movies/sample_300kbit.mov"
-    cp -f sample_300kbit.mov /usr/local/movies/
+    ${BSD_INSTALL_DATA} sample_300kbit.mov /usr/local/movies/
 
     echo copying "sample_100kbit.mp4" into "/usr/local/movies/sample_100kbit.mp4"
-    cp -f sample_100kbit.mp4 /usr/local/movies/
+    ${BSD_INSTALL_DATA} sample_100kbit.mp4 /usr/local/movies/
 
     echo copying "sample_300kbit.mp4" into "/usr/local/movies/sample_300kbit.mp4"
-    cp -f sample_300kbit.mp4 /usr/local/movies/
+    ${BSD_INSTALL_DATA} sample_300kbit.mp4 /usr/local/movies/
 
     echo copying "sample.mp3" into "/usr/local/movies/sample.mp3"
-    cp -f sample.mp3 /usr/local/movies/
+    ${BSD_INSTALL_DATA} sample.mp3 /usr/local/movies/
 
     echo copying "sample_50kbit.3gp" into "/usr/local/movies/sample_50kbit.3gp"
-    cp -f sample_50kbit.3gp /usr/local/movies/
+    ${BSD_INSTALL_DATA} sample_50kbit.3gp /usr/local/movies/
 
     echo copying "sample_h264_100kbit.mp4" into "/usr/local/movies/sample_h264_100kbit.mp4"
-    cp -f sample_h264_100kbit.mp4 /usr/local/movies/
+    ${BSD_INSTALL_DATA} sample_h264_100kbit.mp4 /usr/local/movies/
 
     echo copying "sample_h264_300kbit.mp4" into "/usr/local/movies/sample_h264_300kbit.mp4"
-    cp -f sample_h264_300kbit.mp4 /usr/local/movies/
+    ${BSD_INSTALL_DATA} sample_h264_300kbit.mp4 /usr/local/movies/
 
     echo copying "sample_h264_1mbit.mp4" into "/usr/local/movies/sample_h264_1mbit.mp4"
-    cp -f sample_h264_1mbit.mp4 /usr/local/movies/
+    ${BSD_INSTALL_DATA} sample_h264_1mbit.mp4 /usr/local/movies/
 
 if [ -e StreamingLoadTool ]; then
 	echo copying "StreamingLoadTool" to "/usr/local/bin/StreamingLoadTool"
-	cp -f StreamingLoadTool /usr/local/bin/
+	${BSD_INSTALL_PROGRAM} StreamingLoadTool /usr/local/bin/
 	
-	echo copying "streamingloadtool.conf" to "/etc/streaming/streamingloadtool.conf"
-	cp -f streamingloadtool.conf /etc/streaming/
+	echo copying "streamingloadtool.conf" to "/etc/streaming/streamingloadtool.conf-dist"
+	${BSD_INSTALL_DATA} streamingloadtool.conf /etc/streaming/streamingloadtool.conf-dist
 fi
 	
 	#WebAdmin install
 	echo copying "streamingadminserver.pl" into "/usr/local/sbin/streamingadminserver.pl"
-	cp -f streamingadminserver.pl /usr/local/sbin/streamingadminserver.pl
+	${BSD_INSTALL_SCRIPT} streamingadminserver.pl /usr/local/sbin/streamingadminserver.pl
 	
 	if [ -d /var/streaming/AdminHtml/ ]; then
 	    echo removing old version of html from "/var/streaming/AdminHtml"
 	    rm -r -f /var/streaming/AdminHtml/*
 	fi    
 	
-	if [ ! -d /var/streaming/ ]; then
+	if [ ! -d /var/streaming/AdminHtml ]; then
 		echo creating "/var/streaming/AdminHtml" directory
 		mkdir -p /var/streaming/AdminHtml
 	fi
 	echo copying Admin HTML to "/var/streaming/AdminHtml" directory
-	cp -f -r AdminHtml /var/streaming/
+	tar -cf - AdminHtml | tar -xf - -C ${DATADIR}
 	
 
 	chown -R -f qtss /var/streaming/
 	chown -R -f qtss /etc/streaming/
 	chown -R -f qtss /usr/local/movies/
 
-	echo;echo "Launching streamingadminserver.pl"
-	/usr/local/sbin/streamingadminserver.pl
+#	echo;echo "Launching streamingadminserver.pl"
+#	/usr/local/sbin/streamingadminserver.pl
 	
 	echo;echo Installation Complete
 
+if false; then
 	# Setup for DSS
 	# Prompts for a username and password
 	# that can be used to administer the server
@@ -416,6 +429,7 @@
 	chown -R -f qtss /etc/streaming/
 	
 	echo Setup Complete!
+fi
 	
 else