diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2007-12-05 16:37:51 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2007-12-05 16:37:51 +0000 |
| commit | 9d1baa6fe4294ce873c93a305f375a091cd903c2 (patch) | |
| tree | 1b5fe038db3bcb78b2e32713580535c21d3b0d00 /setup_native | |
| parent | 2d5ce69b79850877f57ff9900c99fb6eeffc8669 (diff) | |
INTEGRATION: CWS native120 (1.8.46); FILE MERGED
2007/11/23 12:57:00 is 1.8.46.1: #150963# patch install rpm kde-integration
Diffstat (limited to 'setup_native')
| -rw-r--r-- | setup_native/scripts/linuxpatchscript.sh | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/setup_native/scripts/linuxpatchscript.sh b/setup_native/scripts/linuxpatchscript.sh index 3ed2a917b9d7..0714f676d1b9 100644 --- a/setup_native/scripts/linuxpatchscript.sh +++ b/setup_native/scripts/linuxpatchscript.sh @@ -50,11 +50,24 @@ if [ "x$SEARCHTOOLBARRPM" != "x" ]; then SEARCHTOOLBARINSTALLED=`grep searchtoolbar ${RPMLIST}` if [ "x$SEARCHTOOLBARINSTALLED" == "x" ]; then - # Install the online update rpm + # Install the search toolbar rpm RPMLIST="$RPMLIST $SEARCHTOOLBARRPM" fi fi +# Check, if kde-integration rpm is available +KDERPM=`ls $BASEDIR/RPMS/*.rpm | grep kde-integration` + +if [ "x$KDERPM" != "x" ]; then + # Check, that $RPMLIST does not contain kde integration rpm (then it is already installed) + KDERPMINSTALLED=`grep kde-integration ${RPMLIST}` + + if [ "x$KDERPMINSTALLED" == "x" ]; then + # Install the kde integration rpm + RPMLIST="$RPMLIST $KDERPM" + fi +fi + echo rpm --upgrade -v --hash --prefix $PRODUCTINSTALLLOCATION --notriggers $RPMLIST echo |