diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-05-06 09:55:21 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-05-06 09:55:21 +0000 |
| commit | c1fbd7bc6a8a9764ccef49bb94c4aae3553a0890 (patch) | |
| tree | e1830b520210a4831fe325fb3e7fb3d18f3d8fe8 /setup_native/scripts/install_linux.sh | |
| parent | 2d4692b3bd7c639097aa5c370442355e0f985c05 (diff) | |
INTEGRATION: CWS native147 (1.20.14); FILE MERGED
2008/04/25 10:09:44 obr 1.20.14.1: #i88334# append original install prefix
Diffstat (limited to 'setup_native/scripts/install_linux.sh')
| -rw-r--r-- | setup_native/scripts/install_linux.sh | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/setup_native/scripts/install_linux.sh b/setup_native/scripts/install_linux.sh index 334ae5c30e72..2f3bbd3ea780 100644 --- a/setup_native/scripts/install_linux.sh +++ b/setup_native/scripts/install_linux.sh @@ -113,7 +113,7 @@ fi # Check and get the list of packages to install # -RPMLIST=`find $PACKAGE_PATH -maxdepth 2 -type f -name "*.rpm" ! -name "*-menus-*" ! -name "*-desktop-integration-*" ! -name "adabas*" ! -name "jre*" -print` +RPMLIST=`find $PACKAGE_PATH -maxdepth 2 -type f -name "*.rpm" ! -name "*-menus-*" ! -name "*-desktop-integration-*" ! -name "jre*" -print` if [ -z "$RPMLIST" ] then @@ -126,13 +126,7 @@ fi # INSTALLDIR=$2 - -# Check for old style .RPM_OFFICEDATABASE first -if [ -d ${INSTALLDIR}/.RPM_OFFICEDATABASE ]; then - RPM_DB_PATH=${INSTALLDIR}/.RPM_OFFICEDATABASE -else - RPM_DB_PATH=${INSTALLDIR}/.RPM_DATABASE -fi +RPM_DB_PATH=${INSTALLDIR}/var/lib/rpm # Check for versionrc if [ -f ${INSTALLDIR}/program/versionrc ]; then VERSIONRC=versionrc; fi @@ -257,9 +251,8 @@ echo "Path to the installation: " $INSTALLDIR echo echo "Installing the RPMs" -# inject a second slash to the last path segment to avoid rpm 3 concatination bug -NEWPREFIX=`cd ${INSTALLDIR}; pwd | sed -e 's|\(.*\)\/\(.*\)|\1\/\/\2|'` -RELOCATIONS=`rpm -qp --qf "--relocate %{PREFIXES}=${NEWPREFIX} \n" $RPMLIST | sort -u | tr -d "\012"` +ABSROOT=`cd ${INSTALLDIR}; pwd` +RELOCATIONS=`rpm -qp --qf "--relocate %{PREFIXES}=${ABSROOT}%{PREFIXES} \n" $RPMLIST | sort -u | tr -d "\012"` UserInstallation=\$BRAND_BASE_DIR/../UserInstallation rpm $RPMCMD --ignoresize -vh $RELOCATIONS --dbpath $RPM_DB_PATH $RPMLIST # |