diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2007-10-15 12:35:46 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2007-10-15 12:35:46 +0000 |
| commit | a6c0a08b3ac7c78482ab36a9b94250053fc2057b (patch) | |
| tree | 58cd918bd11542986b48d709d43e98e23a0ad917 /setup_native | |
| parent | bf1c92acc1c9461572ba3bd75a6a51daabfc9842 (diff) | |
INTEGRATION: CWS native106 (1.4.14); FILE MERGED
2007/08/13 15:44:32 is 1.4.14.1: #i80641# saving jre for uninstallation
Diffstat (limited to 'setup_native')
| -rw-r--r-- | setup_native/scripts/javaloader.sh | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/setup_native/scripts/javaloader.sh b/setup_native/scripts/javaloader.sh index 603c6610f..662077d17 100644 --- a/setup_native/scripts/javaloader.sh +++ b/setup_native/scripts/javaloader.sh @@ -108,6 +108,26 @@ EOF exit $errorcode } +set_jre_for_uninstall() +{ + # if "uninstalldata" exists, this is not required + if [ ! -d "uninstalldata" ]; then + packagepath="RPMS" + jrefile=`find $packagepath -type f -name "jre*.rpm" -print` + jrefile=`basename $jrefile` + if [ -z "$jrefile" ]; then + jrefile="notfound" + fi + + # check existence of jre rpm + if [ ! -f $packagepath/$jrefile ]; then + errortext="Error: Java Runtime Environment (JRE) not found in directory: $packagepath" + errorcode="4" + do_exit + fi + fi +} + install_linux_rpm() { # Linux requires usage of rpm2cpio to install JRE with user privileges @@ -434,6 +454,14 @@ if [ "$java_runtime_set" != "yes" ]; then fi fi +# jre for Linux is also required, if java runtime is set (for uninstallation mode) +if [ "$java_runtime_set" = "yes" ]; then + platform=`uname -s` + if [ "`uname -s`" = "Linux" ]; then + set_jre_for_uninstall + fi +fi + start_java cleanup |