From c05ac08f78b911bcf9334cb9cbdafb258d273ab0 Mon Sep 17 00:00:00 2001
From: fgerlits <fgerlits@cfc7b370-4200-0410-a6e3-cb6bdb053afe>
Date: Sat, 20 Aug 2005 14:19:59 +0000
Subject: [PATCH] added ls_tmp_dir substitution to use_setup script

---
 livesupport/bin/user_setup.sh | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/livesupport/bin/user_setup.sh b/livesupport/bin/user_setup.sh
index 6e7d82bc4..cbf144356 100755
--- a/livesupport/bin/user_setup.sh
+++ b/livesupport/bin/user_setup.sh
@@ -22,7 +22,7 @@
 #
 #
 #   Author   : $Author: fgerlits $
-#   Version  : $Revision: 1.10 $
+#   Version  : $Revision: 1.11 $
 #   Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/bin/user_setup.sh,v $
 #-------------------------------------------------------------------------------                                                                                
 #-------------------------------------------------------------------------------
@@ -55,7 +55,7 @@ usrdir=`cd $basedir/usr; pwd;`
 #-------------------------------------------------------------------------------
 printUsage()
 {
-    echo "LiveSupport install script.";
+    echo "LiveSupport local user settings setup script.";
     echo "parameters";
     echo "";
     echo "  -g, --apache-group  The group the apache daemon runs as.";
@@ -166,6 +166,7 @@ ls_scheduler_host=$hostname
 ls_scheduler_port=$scheduler_port
 ls_scheduler_urlPrefix=
 ls_scheduler_xmlRpcPrefix=RC2
+ls_tmp_dir=$tmpdir
 
 ls_audio_output_device=$output_device
 ls_audio_cue_device=$cue_device
@@ -182,6 +183,7 @@ ls_scheduler_urlPrefix_s=`echo $ls_scheduler_urlPrefix | \
                                 sed -e "s/\//\\\\\\\\\//g"`
 ls_scheduler_xmlRpcPrefix_s=`echo $ls_scheduler_xmlRpcPrefix | \
                                 sed -e "s/\//\\\\\\\\\//g"`
+ls_tmp_dir_s=`echo $ls_tmp_dir | sed -e "s/\//\\\\\\\\\//g"`
 
 replace_sed_string="s/ls_install_dir/$installdir_s/; \
               s/ls_dbuser/$ls_dbuser/; \
@@ -200,8 +202,11 @@ replace_sed_string="s/ls_install_dir/$installdir_s/; \
               s/ls_scheduler_host/$ls_scheduler_host/; \
               s/ls_scheduler_port/$ls_scheduler_port/; \
               s/ls_audio_output_device/$ls_audio_output_device/; \
-              s/ls_audio_cue_device/$ls_audio_cue_device/;"
-
+              s/ls_audio_cue_device/$ls_audio_cue_device/; \
+              s/ls_tmp_dir/$ls_tmp_dir_s/;"
+echo
+echo $replace_sed_string
+echo
 
 
 #-------------------------------------------------------------------------------