diff --git a/livesupport/bin/copyInstall.sh b/livesupport/bin/copyInstall.sh index ce2f8728e..35910449c 100755 --- a/livesupport/bin/copyInstall.sh +++ b/livesupport/bin/copyInstall.sh @@ -21,8 +21,8 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # # -# Author : $Author: maroy $ -# Version : $Revision: 1.4 $ +# Author : $Author: tomas $ +# Version : $Revision: 1.5 $ # Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/bin/Attic/copyInstall.sh,v $ #------------------------------------------------------------------------------- #------------------------------------------------------------------------------- @@ -151,6 +151,7 @@ cp -pPR $modules_dir/htmlUI/var $install_var/htmlUI #------------------------------------------------------------------------------- cp -pPR $usrdir/lib/* $install_lib cp -pPR $usrdir/etc/* $install_etc +cp -pPR $usrdir/lib/php/* $install_lib #------------------------------------------------------------------------------- diff --git a/livesupport/bin/dist.sh b/livesupport/bin/dist.sh index 1225138c0..1fd239ac3 100755 --- a/livesupport/bin/dist.sh +++ b/livesupport/bin/dist.sh @@ -21,8 +21,8 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # # -# Author : $Author: maroy $ -# Version : $Revision: 1.7 $ +# Author : $Author: tomas $ +# Version : $Revision: 1.8 $ # Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/bin/dist.sh,v $ #------------------------------------------------------------------------------- #------------------------------------------------------------------------------- @@ -180,6 +180,7 @@ taglib_dir=$toolsdir/taglib taglib_version=taglib-1.3.1 taglib_tmpdir=$tools_tmpdir/taglib +pear_dir=$toolsdir/pear #------------------------------------------------------------------------------- # Create the sources tarball first @@ -285,6 +286,9 @@ cp -pPR $curl_dir/$curl_version $curl_tmpdir mkdir -p $taglib_tmpdir cp -pPR $taglib_dir/$taglib_version $taglib_tmpdir +mkdir -p $pear_tmpdir +cp -pPR $pear_dir $tools_tmpdir + #------------------------------------------------------------------------------- # Get rid of the remnants of the CVS system diff --git a/livesupport/bin/preInstall.sh b/livesupport/bin/preInstall.sh index adb5a1647..5a158ecfa 100755 --- a/livesupport/bin/preInstall.sh +++ b/livesupport/bin/preInstall.sh @@ -21,8 +21,8 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # # -# Author : $Author: maroy $ -# Version : $Revision: 1.1 $ +# Author : $Author: tomas $ +# Version : $Revision: 1.2 $ # Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/bin/preInstall.sh,v $ #------------------------------------------------------------------------------- #------------------------------------------------------------------------------- @@ -164,18 +164,20 @@ check_exe "php" || exit 1; check_exe "pear" || exit 1; check_exe "odbcinst" || exit 1; -check_pear_module "DB" || exit 1; -check_pear_module "Calendar" || exit 1; -check_pear_module "File" || exit 1; -check_pear_module "File_Find" || exit 1; -check_pear_module "HTML_Common" || exit 1; -check_pear_module "HTML_QuickForm" || exit 1; -check_pear_module "XML_Beautifier" || exit 1; -check_pear_module "XML_Parser" || exit 1; -check_pear_module "XML_RPC" || exit 1; -check_pear_module "XML_Serializer" || exit 1; -check_pear_module "XML_Util" || exit 1; +#check_pear_module "DB" || exit 1; +#check_pear_module "Calendar" || exit 1; +#check_pear_module "File" || exit 1; +#check_pear_module "File_Find" || exit 1; +#check_pear_module "HTML_Common" || exit 1; +#check_pear_module "HTML_QuickForm" || exit 1; +#check_pear_module "XML_Beautifier" || exit 1; +#check_pear_module "XML_Parser" || exit 1; +#check_pear_module "XML_RPC" || exit 1; +#check_pear_module "XML_Serializer" || exit 1; +#check_pear_module "XML_Util" || exit 1; +echo "preinstalling pear packages..." +$toolsdir/pear/bin/install.sh || exit 1; #------------------------------------------------------------------------------- # Say goodbye