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

fixed wrong processing of LS pear packages and storageAdmin in debian 

package (#980 and #1143)
This commit is contained in:
tomas 2005-06-14 14:38:01 +00:00
parent 86ab132449
commit 5d5c6eea68
7 changed files with 31 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
livesupport/bin/copyInstall.sh
View File

@ -21,8 +21,8 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
#
# Author : $Author: mash $
# Version : $Revision: 1.8 $
# Author : $Author: tomas $
# Version : $Revision: 1.9 $
# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/bin/Attic/copyInstall.sh,v $
#-------------------------------------------------------------------------------
#-------------------------------------------------------------------------------
@ -147,8 +147,11 @@ cp -pPR $modules_dir/archiveServer/var $install_var/archiveServer
mkdir $install_var/htmlUI
cp -pPR $modules_dir/htmlUI/var $install_var/htmlUI
mkdir $install_usr/storageAdmin
cp -pPR $modules_dir/storageAdmin/bin $install_usr/storageAdmin
cp -pPR $modules_dir/storageAdmin/bin $install_usr
cp -pPR $modules_dir/storageAdmin/var $install_usr
mkdir -p $install_usr/lib
cp -pPR $toolsdir/pear $install_usr/lib
#-------------------------------------------------------------------------------

8
livesupport/bin/install.sh
View File

@ -22,7 +22,7 @@
#
#
# Author : $Author: tomas $
# Version : $Revision: 1.11 $
# Version : $Revision: 1.12 $
# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/bin/Attic/install.sh,v $
#-------------------------------------------------------------------------------
#-------------------------------------------------------------------------------
@ -215,12 +215,6 @@ $bindir/preInstall.sh --apache-group $apache_group || exit 1;
$bindir/copyInstall.sh --directory $installdir || exit 1;
#-------------------------------------------------------------------------------
# Install PEAR packages (locally in the LiveSupport)
#-------------------------------------------------------------------------------
$toolsdir/pear/bin/install.sh -d $installdir || exit 1;
#-------------------------------------------------------------------------------
# Do post-install setup
#-------------------------------------------------------------------------------

13
livesupport/bin/postInstallScheduler.sh
View File

@ -22,7 +22,7 @@
#
#
# Author : $Author: tomas $
# Version : $Revision: 1.4 $
# Version : $Revision: 1.5 $
# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/bin/Attic/postInstallScheduler.sh,v $
#-------------------------------------------------------------------------------
#-------------------------------------------------------------------------------
@ -43,6 +43,7 @@ bindir=$basedir/bin
etcdir=$basedir/etc
docdir=$basedir/doc
tmpdir=$basedir/tmp
usrdir=$basedir/usr
#-------------------------------------------------------------------------------
@ -375,6 +376,12 @@ odbcinst -i -s -l -f $odbc_template_tmp || exit 1;
rm -f $odbc_template_tmp
#-------------------------------------------------------------------------------
# Install PEAR packages (locally in the LiveSupport)
#-------------------------------------------------------------------------------
$install_usr/lib/pear/bin/install.sh -d $installdir || exit 1;
#-------------------------------------------------------------------------------
# Customize the configuration files with the appropriate values
#-------------------------------------------------------------------------------
@ -388,9 +395,9 @@ cat $install_var/archiveServer/var/conf.php.template \
| sed -e "$replace_sed_string" \
> $install_var/archiveServer/var/conf.php
cat $install_usr/storageAdmin/bin/php/conf.php.template \
cat $install_usr/var/conf.php.template \
| sed -e "$replace_sed_string" \
> $install_usr/storageAdmin/bin/php/conf.php
> $install_usr/var/conf.php
cat $install_etc/scheduler.xml.template \
| sed -e "$replace_sed_string" \

10
livesupport/etc/Makefile.in
View File

@ -20,8 +20,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/etc/Makefile.in,v $
#-------------------------------------------------------------------------------
@ -183,7 +183,7 @@ ${TMP_DIR}/tools_setup.stamp:
${ICU_DIR}/${ICU_VERSION}/bin/install.sh
${CURL_DIR}/${CURL_VERSION}/bin/install.sh
${TAGLIB_DIR}/${TAGLIB_VERSION}/bin/install.sh
${PEAR_DIR}/bin/install.sh
# ${PEAR_DIR}/bin/install.sh
touch ${TMP_DIR}/tools_setup.stamp
doxytag_setup: ${TMP_DIR}/doxytag_setup.stamp
@ -201,8 +201,8 @@ ${TMP_DIR}/modules_setup.stamp:
${EVENT_SCHEDULER_DIR}/bin/autogen.sh
${SCHEDULER_CLIENT_DIR}/bin/autogen.sh
${WIDGETS_DIR}/bin/autogen.sh
-${MAKE} -C ${ARCHIVE_SERVER_DIR} all
-${MAKE} -C ${STORAGE_SERVER_DIR} all
# -${MAKE} -C ${ARCHIVE_SERVER_DIR} all
# -${MAKE} -C ${STORAGE_SERVER_DIR} all
touch ${TMP_DIR}/modules_setup.stamp
products_setup: ${TMP_DIR}/products_setup.stamp

12
livesupport/etc/debian/livesupport-station.preinst
View File

@ -88,18 +88,6 @@ case "$1" in
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;
echo "Checking for validity of apache daemon group $apache_group...";
check_group_permission $apache_group || exit 1;

6
livesupport/etc/debian/rules
View File

@ -82,6 +82,7 @@ install-arch:
mkdir -p $(CURDIR)/debian/livesupport-station/opt/livesupport/etc
mkdir -p $(CURDIR)/debian/livesupport-station/opt/livesupport/tmp
mkdir -p $(CURDIR)/debian/livesupport-station/opt/livesupport/var
mkdir -p $(CURDIR)/debian/livesupport-station/opt/livesupport/usr/lib
mv -f $(CURDIR)/debian/livesupport/opt/livesupport/bin/scheduler \
$(CURDIR)/debian/livesupport/opt/livesupport/bin/scheduler.sh \
$(CURDIR)/debian/livesupport/opt/livesupport/bin/postInstallScheduler.sh \
@ -95,6 +96,11 @@ install-arch:
$(CURDIR)/debian/livesupport/opt/livesupport/var/htmlUI \
$(CURDIR)/debian/livesupport/opt/livesupport/var/storageServer \
$(CURDIR)/debian/livesupport-station/opt/livesupport/var
mv -f $(CURDIR)/debian/livesupport/opt/livesupport/usr/lib/pear \
$(CURDIR)/debian/livesupport-station/opt/livesupport/usr/lib
mv -f $(CURDIR)/debian/livesupport/opt/livesupport/usr/bin \
$(CURDIR)/debian/livesupport/opt/livesupport/usr/var \
$(CURDIR)/debian/livesupport-station/opt/livesupport/usr
# now separate the studio (client) files into debian/livesupport-studio
mkdir -p $(CURDIR)/debian/livesupport-studio

4
livesupport/tools/pear/bin/install.sh
View File

@ -22,7 +22,7 @@
#
#
# Author : $Author: tomas $
# Version : $Revision: 1.6 $
# Version : $Revision: 1.7 $
# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/tools/pear/bin/install.sh,v $
#-------------------------------------------------------------------------------
#-------------------------------------------------------------------------------
@ -39,7 +39,7 @@ basedir=`cd $reldir; pwd;`
bindir=$basedir/bin
etcdir=$basedir/etc
srcdir=$basedir/src
installdir=$basedir/../..
installdir=$basedir/../../..
description="PEAR packages needed by LiveSupport"