diff --git a/livesupport/bin/copyInstall.sh b/livesupport/bin/copyInstall.sh index 94677ada7..3f4101712 100755 --- a/livesupport/bin/copyInstall.sh +++ b/livesupport/bin/copyInstall.sh @@ -22,7 +22,7 @@ # # # Author : $Author: maroy $ -# Version : $Revision: 1.12 $ +# Version : $Revision: 1.13 $ # Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/bin/Attic/copyInstall.sh,v $ #------------------------------------------------------------------------------- #------------------------------------------------------------------------------- @@ -167,13 +167,9 @@ cp -pPR $usrdir/etc/* $install_etc #------------------------------------------------------------------------------- gstreamer_dir=`find $install_lib -type d -name "gstreamer-*"` +cp -pPR $usrdir/bin/gst-* $install_bin cp -pPR $modules_dir/gstreamerElements/lib/lib*.so $gstreamer_dir -export LD_LIBRARY_PATH=$install_lib -export GST_REGISTRY=$install_etc/gst-registry.xml -export GST_PLUGIN_PATH=$gstreamer_dir -$usrdir/bin/gst-register > /dev/null 2>&1 - #------------------------------------------------------------------------------- # Copy scheduler related files diff --git a/livesupport/bin/createDebianPackages.sh b/livesupport/bin/createDebianPackages.sh index 664afa026..0e7be1bd4 100755 --- a/livesupport/bin/createDebianPackages.sh +++ b/livesupport/bin/createDebianPackages.sh @@ -22,7 +22,7 @@ # # # Author : $Author: maroy $ -# Version : $Revision: 1.4 $ +# Version : $Revision: 1.5 $ # Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/bin/createDebianPackages.sh,v $ #------------------------------------------------------------------------------- #------------------------------------------------------------------------------- @@ -147,10 +147,10 @@ echo "" #------------------------------------------------------------------------------- check_exe() { if [ -x "`which $1 2> /dev/null`" ]; then - echo "Exectuable $1 found..."; + echo "Executable $1 found..."; return 0; else - echo "Exectuable $1 not found..."; + echo "Executable $1 not found..."; return 1; fi } diff --git a/livesupport/bin/postInstallGLiveSupport.sh b/livesupport/bin/postInstallGLiveSupport.sh index 728c55262..5b9f86b36 100755 --- a/livesupport/bin/postInstallGLiveSupport.sh +++ b/livesupport/bin/postInstallGLiveSupport.sh @@ -22,7 +22,7 @@ # # # Author : $Author: maroy $ -# Version : $Revision: 1.6 $ +# Version : $Revision: 1.7 $ # Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/bin/Attic/postInstallGLiveSupport.sh,v $ #------------------------------------------------------------------------------- #------------------------------------------------------------------------------- @@ -211,10 +211,10 @@ replace_sed_string="s/ls_install_dir/$installdir_s/; \ #------------------------------------------------------------------------------- check_exe() { if [ -x "`which $1 2> /dev/null`" ]; then - echo "Exectuable $1 found..."; + echo "Executable $1 found..."; return 0; else - echo "Exectuable $1 not found..."; + echo "Executable $1 not found..."; return 1; fi } @@ -256,6 +256,18 @@ cat $install_etc/gLiveSupport.xml.template \ > $install_etc/gLiveSupport.xml +#------------------------------------------------------------------------------- +# Create the gstreamer registry +#------------------------------------------------------------------------------- +echo "Creating gstreamer registry..."; + +gstreamer_dir=`find $install_lib -type d -name "gstreamer-*"` +export LD_LIBRARY_PATH=$install_lib +export GST_REGISTRY=$install_etc/gst-registry.xml +export GST_PLUGIN_PATH=$gstreamer_dir +$install_bin/gst-register > /dev/null 2>&1 + + #------------------------------------------------------------------------------- # Say goodbye #------------------------------------------------------------------------------- diff --git a/livesupport/bin/postInstallScheduler.sh b/livesupport/bin/postInstallScheduler.sh index 9b3535e24..e59f066d7 100755 --- a/livesupport/bin/postInstallScheduler.sh +++ b/livesupport/bin/postInstallScheduler.sh @@ -21,8 +21,8 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # # -# Author : $Author: fgerlits $ -# Version : $Revision: 1.7 $ +# Author : $Author: maroy $ +# Version : $Revision: 1.8 $ # Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/bin/Attic/postInstallScheduler.sh,v $ #------------------------------------------------------------------------------- #------------------------------------------------------------------------------- @@ -271,10 +271,10 @@ replace_sed_string="s/ls_install_dir/$installdir_s/; \ #------------------------------------------------------------------------------- check_exe() { if [ -x "`which $1 2> /dev/null`" ]; then - echo "Exectuable $1 found..."; + echo "Executable $1 found..."; return 0; else - echo "Exectuable $1 not found..."; + echo "Executable $1 not found..."; return 1; fi } @@ -523,6 +523,18 @@ $bindir/scheduler.sh install || exit 1; cd - +#------------------------------------------------------------------------------- +# Create the gstreamer registry +#------------------------------------------------------------------------------- +echo "Creating gstreamer registry..."; + +gstreamer_dir=`find $install_lib -type d -name "gstreamer-*"` +export LD_LIBRARY_PATH=$install_lib +export GST_REGISTRY=$install_etc/gst-registry.xml +export GST_PLUGIN_PATH=$gstreamer_dir +$install_bin/gst-register > /dev/null 2>&1 + + #------------------------------------------------------------------------------- # Say goodbye #------------------------------------------------------------------------------- diff --git a/livesupport/bin/postUninstall.sh b/livesupport/bin/postUninstall.sh index c823d3f14..8c4e70f10 100755 --- a/livesupport/bin/postUninstall.sh +++ b/livesupport/bin/postUninstall.sh @@ -22,7 +22,7 @@ # # # Author : $Author: maroy $ -# Version : $Revision: 1.1 $ +# Version : $Revision: 1.2 $ # Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/bin/postUninstall.sh,v $ #------------------------------------------------------------------------------- #------------------------------------------------------------------------------- @@ -163,10 +163,10 @@ install_var=$installdir/var #------------------------------------------------------------------------------- check_exe() { if [ -x "`which $1 2> /dev/null`" ]; then - echo "Exectuable $1 found..."; + echo "Executable $1 found..."; return 0; else - echo "Exectuable $1 not found..."; + echo "Executable $1 not found..."; return 1; fi } diff --git a/livesupport/bin/preInstall.sh b/livesupport/bin/preInstall.sh index 0f85ca807..8f57d64aa 100755 --- a/livesupport/bin/preInstall.sh +++ b/livesupport/bin/preInstall.sh @@ -22,7 +22,7 @@ # # # Author : $Author: maroy $ -# Version : $Revision: 1.3 $ +# Version : $Revision: 1.4 $ # Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/bin/preInstall.sh,v $ #------------------------------------------------------------------------------- #------------------------------------------------------------------------------- @@ -126,10 +126,10 @@ rm -f $group_tmp_file; #------------------------------------------------------------------------------- check_exe() { if [ -x "`which $1 2> /dev/null`" ]; then - echo "Exectuable $1 found..."; + echo "Executable $1 found..."; return 0; else - echo "Exectuable $1 not found..."; + echo "Executable $1 not found..."; return 1; fi } diff --git a/livesupport/bin/setup_test_db.sh b/livesupport/bin/setup_test_db.sh index 82e8d8223..8f8821469 100755 --- a/livesupport/bin/setup_test_db.sh +++ b/livesupport/bin/setup_test_db.sh @@ -22,7 +22,7 @@ # # # Author : $Author: maroy $ -# Version : $Revision: 1.1 $ +# Version : $Revision: 1.2 $ # Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/bin/setup_test_db.sh,v $ #------------------------------------------------------------------------------- #------------------------------------------------------------------------------- @@ -67,10 +67,10 @@ postgres_user=postgres #------------------------------------------------------------------------------- check_exe() { if [ -x "`which $1 2> /dev/null`" ]; then - echo "Exectuable $1 found..."; + echo "Executable $1 found..."; return 0; else - echo "Exectuable $1 not found..."; + echo "Executable $1 not found..."; return 1; fi } diff --git a/livesupport/bin/user_setup.sh b/livesupport/bin/user_setup.sh index 608d824ee..40ce2c742 100755 --- a/livesupport/bin/user_setup.sh +++ b/livesupport/bin/user_setup.sh @@ -21,8 +21,8 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # # -# Author : $Author: fgerlits $ -# Version : $Revision: 1.7 $ +# Author : $Author: maroy $ +# Version : $Revision: 1.8 $ # Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/bin/user_setup.sh,v $ #------------------------------------------------------------------------------- #------------------------------------------------------------------------------- @@ -211,10 +211,10 @@ replace_sed_string="s/ls_install_dir/$installdir_s/; \ #------------------------------------------------------------------------------- check_exe() { if [ -x "`which $1 2> /dev/null`" ]; then - echo "Exectuable $1 found..."; + echo "Executable $1 found..."; return 0; else - echo "Exectuable $1 not found..."; + echo "Executable $1 not found..."; return 1; fi } diff --git a/livesupport/bin/user_setup_db.sh b/livesupport/bin/user_setup_db.sh index dd0bcbaa6..ba0a13714 100755 --- a/livesupport/bin/user_setup_db.sh +++ b/livesupport/bin/user_setup_db.sh @@ -22,7 +22,7 @@ # # # Author : $Author: maroy $ -# Version : $Revision: 1.2 $ +# Version : $Revision: 1.3 $ # Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/bin/user_setup_db.sh,v $ #------------------------------------------------------------------------------- #------------------------------------------------------------------------------- @@ -163,10 +163,10 @@ replace_sed_string="s/ls_dbuser/$ls_dbuser/; \ #------------------------------------------------------------------------------- check_exe() { if [ -x "`which $1 2> /dev/null`" ]; then - echo "Exectuable $1 found..."; + echo "Executable $1 found..."; return 0; else - echo "Exectuable $1 not found..."; + echo "Executable $1 not found..."; return 1; fi } diff --git a/livesupport/etc/debian/livesupport-station.init.d b/livesupport/etc/debian/livesupport-station.init.d index b9eae72c0..726fc84cf 100644 --- a/livesupport/etc/debian/livesupport-station.init.d +++ b/livesupport/etc/debian/livesupport-station.init.d @@ -6,9 +6,12 @@ LIVESUPPORT_DIR=/opt/livesupport LIVESUPPORT_BIN=$LIVESUPPORT_DIR/bin LIVESUPPORT_ETC=$LIVESUPPORT_DIR/etc LIVESUPPORT_LIB=$LIVESUPPORT_DIR/lib +GSTREAMER_DIR=`find $LIVESUPPORT_LIB -type d -name "gstreamer-*"` PATH=/sbin:/bin:/usr/sbin:/usr/bin:$LIVESUPPORT_BIN LD_LIBRARY_PATH=$LIVESUPPORT_LIB:$LD_LIBRARY_PATH +GST_REGISTRY=$LIVESUPPORT_ETC/gst-registry.xml +GST_PLUGIN_PATH=$GSTREAMER_DIR DAEMON=$LIVESUPPORT_BIN/scheduler NAME=livesupport-scheduler DESC="livesupport scheduler" @@ -17,6 +20,8 @@ test -x $DAEMON || exit 0 export PATH export LD_LIBRARY_PATH +export GST_REGISTRY +export GST_PLUGIN_PATH DAEMON_OPTS="-c $LIVESUPPORT_ETC/scheduler.xml" diff --git a/livesupport/etc/debian/rules b/livesupport/etc/debian/rules index 4821cdd66..d6290c255 100755 --- a/livesupport/etc/debian/rules +++ b/livesupport/etc/debian/rules @@ -71,9 +71,12 @@ install-arch: # now separate the libraries into debian/livesupport-libs mkdir -p $(CURDIR)/debian/livesupport-libs mkdir -p $(CURDIR)/debian/livesupport-libs/opt/livesupport + mkdir -p $(CURDIR)/debian/livesupport-libs/opt/livesupport/bin mkdir -p $(CURDIR)/debian/livesupport-libs/opt/livesupport/tmp mv -f $(CURDIR)/debian/livesupport/opt/livesupport/lib \ $(CURDIR)/debian/livesupport-libs/opt/livesupport + cp -f $(CURDIR)/debian/livesupport/opt/livesupport/bin/gst-* \ + $(CURDIR)/debian/livesupport-libs/opt/livesupport/bin # now separate the station (server) files into debian/livesupport-station mkdir -p $(CURDIR)/debian/livesupport-station @@ -118,7 +121,7 @@ install-arch: mv -f $(CURDIR)/debian/livesupport/opt/livesupport/etc/gLiveSupport.xml* \ $(CURDIR)/debian/livesupport/opt/livesupport/etc/gtk-2.0 \ $(CURDIR)/debian/livesupport/opt/livesupport/etc/pango \ - $(CURDIR)/debian/livesupport-studio/opt/livesupport/etc + $(CURDIR)/debian/livesupport-studio/opt/livesupport/etc mv -f $(CURDIR)/debian/livesupport/opt/livesupport/var/widgets \ $(CURDIR)/debian/livesupport/opt/livesupport/var/gLiveSupport*.res \ $(CURDIR)/debian/livesupport/opt/livesupport/var/livesupport.png \