diff --git a/campcaster/bin/postInstallStation.sh b/campcaster/bin/postInstallStation.sh index 560044696..64086679c 100755 --- a/campcaster/bin/postInstallStation.sh +++ b/campcaster/bin/postInstallStation.sh @@ -189,7 +189,8 @@ install_bin=$installdir/bin install_etc=$installdir/etc install_lib=$installdir/lib install_usr=$installdir/usr -install_var_ls=$installdir/var/Campcaster +install_var=$installdir/var +install_var_ls=$install_var/Campcaster #------------------------------------------------------------------------------- @@ -401,6 +402,7 @@ export LD_LIBRARY_PATH=$install_lib # is this needed here? export GST_REGISTRY=$install_etc/gst-registry.xml export GST_PLUGIN_PATH=$install_lib:$gstreamer_dir rm -f ${GST_REGISTRY} +rm -f $install_var/cache/gstreamer-0.8/registry.xml $install_bin/gst-register diff --git a/campcaster/etc/campcaster-scheduler b/campcaster/etc/campcaster-scheduler index e0d864452..d1547f14a 100755 --- a/campcaster/etc/campcaster-scheduler +++ b/campcaster/etc/campcaster-scheduler @@ -10,6 +10,7 @@ GSTREAMER_DIR=`find $CAMPCASTER_LIB -type d -name "gstreamer-*"` PATH=/sbin:/bin:/usr/sbin:/usr/bin:$CAMPCASTER_BIN LD_LIBRARY_PATH=$CAMPCASTER_LIB:$LD_LIBRARY_PATH +GST_REGISTRY=$CAMPCASTER_ETC/gst-registry.xml DAEMON=$CAMPCASTER_BIN/campcaster-scheduler NAME=campcaster-scheduler DESC="campcaster scheduler" @@ -18,6 +19,7 @@ test -x $DAEMON || exit 0 export PATH export LD_LIBRARY_PATH +export GST_REGISTRY DAEMON_OPTS="-c $CAMPCASTER_ETC/campcaster-scheduler.xml" diff --git a/campcaster/src/products/gLiveSupport/bin/campcaster-studio.sh b/campcaster/src/products/gLiveSupport/bin/campcaster-studio.sh index ae8aef913..9cb5d3ada 100755 --- a/campcaster/src/products/gLiveSupport/bin/campcaster-studio.sh +++ b/campcaster/src/products/gLiveSupport/bin/campcaster-studio.sh @@ -45,9 +45,8 @@ tmpdir=$basedir/tmp #------------------------------------------------------------------------------- # Set up the environment #------------------------------------------------------------------------------- -gstreamer_dir=`find $libdir -type d -name "gstreamer-*"` - export LD_LIBRARY_PATH=$libdir:$LD_LIBRARY_PATH +export GST_REGISTRY=$etcdir/gst-registry.xml studio_exe=$bindir/campcaster-studio if [ -f ~/.campcaster/campcaster-studio.xml ]; then diff --git a/campcaster/src/products/scheduler/bin/campcaster-scheduler.sh b/campcaster/src/products/scheduler/bin/campcaster-scheduler.sh index 7148b69d3..de98e1593 100755 --- a/campcaster/src/products/scheduler/bin/campcaster-scheduler.sh +++ b/campcaster/src/products/scheduler/bin/campcaster-scheduler.sh @@ -43,9 +43,8 @@ libdir=$basedir/lib #------------------------------------------------------------------------------- # Set up the environment #------------------------------------------------------------------------------- -gstreamer_dir=`find $libdir -type d -name "gstreamer-*"` - export LD_LIBRARY_PATH=$libdir:$LD_LIBRARY_PATH +export GST_REGISTRY=$etcdir/gst-registry.xml scheduler_exe=$bindir/campcaster-scheduler config_file=$etcdir/campcaster-scheduler.xml