Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

changes that hopefully fix issue #892

Browse source 
see http://bugs.campware.org/view.php?id=892
This commit is contained in:
maroy 2005-04-29 14:21:52 +00:00
parent b960071ff0
commit 1dc66e71a3
4 changed files with 36 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
livesupport/bin/copyInstall.sh
View file

@ -22,7 +22,7 @@
# #
# #
# Author : $Author: maroy $ # Author : $Author: maroy $
# Version : $Revision: 1.3 $ # Version : $Revision: 1.4 $
# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/bin/Attic/copyInstall.sh,v $ # Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/bin/Attic/copyInstall.sh,v $
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
@ -147,9 +147,10 @@ cp -pPR $modules_dir/htmlUI/var $install_var/htmlUI
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
# Copy libraries # Copy libraries and related files
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
cp -pPR $usrdir/lib/* $install_lib cp -pPR $usrdir/lib/* $install_lib
cp -pPR $usrdir/etc/* $install_etc
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------

12
livesupport/bin/install.sh
View file

@ -22,7 +22,7 @@
# #
# #
# Author : $Author: maroy $ # Author : $Author: maroy $
# Version : $Revision: 1.9 $ # Version : $Revision: 1.10 $
# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/bin/Attic/install.sh,v $ # Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/bin/Attic/install.sh,v $
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
@ -193,6 +193,16 @@ echo " apache document root: $www_root";
echo "" echo ""
#-------------------------------------------------------------------------------
# Check if we're in the CVS, and bail out if so
#-------------------------------------------------------------------------------
if [ -f CVS/Root ]; then
echo "ERROR: this script is not intended to be run from the CVS sources.";
echo " run this script from inside the source tarball";
exit 1;
fi
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
# Do pre-install checks # Do pre-install checks
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------

20
livesupport/bin/postInstallGLiveSupport.sh
View file

@ -22,7 +22,7 @@
# #
# #
# Author : $Author: maroy $ # Author : $Author: maroy $
# Version : $Revision: 1.1 $ # Version : $Revision: 1.2 $
# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/bin/Attic/postInstallGLiveSupport.sh,v $ # Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/bin/Attic/postInstallGLiveSupport.sh,v $
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
@ -208,6 +208,24 @@ check_exe "sed" || exit 1;
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
echo "Customizing configuration files..." echo "Customizing configuration files..."
tmp_file=/tmp/livesupport_setup.$$
# customize the GTK- config files, which have hard-coded values in them :(
cat $install_etc/gtk-2.0/gdk-pixbuf.loaders \
| sed -e "s/^\"\/.*\/usr\/lib/\/\"$installdir_s\/lib/g"
> $tmp_file
mv -f $tmp_file $install_etc/gtk-2.0/gdk-pixbuf.loaders
# customize the pango config files, which have hard-coded values in them :(
pango_rc=$install_etc/pango/pango.rc
echo "[Pango]" > $pango_rc
echo "ModuleFiles=$install_etc/pango/pango.modules" > $pango_rc
cat $install_etc/pango/pango.modules \
| sed -e "s/^\/.*\/usr\/lib/\/$installdir_s\/lib/g"
> $tmp_file
mv -f $tmp_file $install_etc/pango/pango.modules
# customize the gLiveSupport config file
cat $install_etc/gLiveSupport.xml.template \ cat $install_etc/gLiveSupport.xml.template \
| sed -e "$replace_sed_string" \ | sed -e "$replace_sed_string" \
> $install_etc/gLiveSupport.xml > $install_etc/gLiveSupport.xml

4
livesupport/products/gLiveSupport/bin/gLiveSupport.sh
View file

@ -22,7 +22,7 @@
# #
# #
# Author : $Author: maroy $ # Author : $Author: maroy $
# Version : $Revision: 1.1 $ # Version : $Revision: 1.2 $
# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/gLiveSupport/bin/gLiveSupport.sh,v $ # Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/gLiveSupport/bin/gLiveSupport.sh,v $
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
@ -47,6 +47,8 @@ tmpdir=$basedir/tmp
# Set up the environment # Set up the environment
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
export LD_LIBRARY_PATH=$libdir:$LD_LIBRARY_PATH export LD_LIBRARY_PATH=$libdir:$LD_LIBRARY_PATH
export GDK_PIXBUF_MODULE_FILE=$etcdir/gtk-2.0/gdk-pixbuf.loaders
export PANGO_RC_FILE=$etcdir/pango/pango.rc
gLiveSupport_exe=$bindir/gLiveSupport gLiveSupport_exe=$bindir/gLiveSupport
config_file=$etcdir/gLiveSupport.xml config_file=$etcdir/gLiveSupport.xml