diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2005-02-24 15:17:05 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2005-02-24 15:17:05 +0000 |
| commit | 50a89dacab88819ee9738fdd00d18f495f9214c3 (patch) | |
| tree | 534f14708d9808366ad07f7ef9f398fca920e9d8 /setup_native/scripts/install_linux.sh | |
| parent | b88ba5c26ec6e63e69f29cec027515443f05b065 (diff) | |
INTEGRATION: CWS nativefixer4 (1.6.4); FILE MERGED
2005/02/14 16:26:22 is 1.6.4.1: #i42530# new core dependencies
Diffstat (limited to 'setup_native/scripts/install_linux.sh')
| -rw-r--r-- | setup_native/scripts/install_linux.sh | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/setup_native/scripts/install_linux.sh b/setup_native/scripts/install_linux.sh index 9ed6efe85adf..03c8763c88e0 100644 --- a/setup_native/scripts/install_linux.sh +++ b/setup_native/scripts/install_linux.sh @@ -72,11 +72,12 @@ fi # Check and get the list of packages to install # -RPMLIST=`find $PACKAGE_PATH -type f -name "*.rpm" ! -name "*-core01-*" ! -name "*-menus-*" ! -name "adabas*" ! -name "jre*" ! -name "*-gnome*" -print` -CORERPM=`find $PACKAGE_PATH -type f -name "*.rpm" -name "*-core01-*" -print` -PREFIX=`rpm -qlp $CORERPM | head -n1` +RPMLIST=`find $PACKAGE_PATH -type f -name "*.rpm" ! -name "*-core*" ! -name "*-menus-*" ! -name "adabas*" ! -name "jre*" ! -name "*-gnome*" -print` +CORERPMLIST=`find $PACKAGE_PATH -type f -name "*.rpm" -name "*-core*" -print` +CORERPM01=`find $PACKAGE_PATH -type f -name "*.rpm" -name "*-core01-*" -print` +PREFIX=`rpm -qlp $CORERPM01 | head -n1` -if [ -z "$CORERPM" ] +if [ -z "$CORERPM01" ] then error "No core package found in directory $PACKAGE_PATH" fi @@ -93,7 +94,7 @@ then fi echo "Packages found:" -for i in $CORERPM $RPMLIST $GNOMERPM; do +for i in $CORERPMLIST $RPMLIST $GNOMERPM; do echo `basename $i` done @@ -143,7 +144,7 @@ echo "Installing the RPMs" # inject a second slash to the last path segment to avoid rpm 3 concatination bug NEWPREFIX=`echo $INSTALLDIR | sed -e 's|\(.*\)\/\(.*\)|\1\/\/\2|'` -rpm --install --nodeps -vh --relocate $PREFIX=$NEWPREFIX --dbpath $RPM_DB_PATH $CORERPM +rpm --install --nodeps -vh --relocate $PREFIX=$NEWPREFIX --dbpath $RPM_DB_PATH $CORERPMLIST rpm --install --nodeps -vh --relocate $PREFIX=$NEWPREFIX --dbpath $RPM_DB_PATH $RPMLIST $GNOMERPM # |