summaryrefslogtreecommitdiff
path: root/setup_native/scripts/javaloader.sh
diff options
context:
space:
mode:
authorIvo Hinkelmann <ihi@openoffice.org>2007-07-12 10:18:55 +0000
committerIvo Hinkelmann <ihi@openoffice.org>2007-07-12 10:18:55 +0000
commit6a54856cc446c0dff9e8f2b7a76f53ddeba63e8e (patch)
tree3bafed16f7a7bdbf5ddc489b1b011c479cdf13af /setup_native/scripts/javaloader.sh
parent60b277f412bea08027bb9b8fd76d60a0042877c2 (diff)
INTEGRATION: CWS native97 (1.3.2); FILE MERGED
2007/07/11 08:27:39 is 1.3.2.2: #i78658# warning, if solaris architecture does not fit 2007/07/10 16:08:01 is 1.3.2.1: #i78658# checking solaris architecture
Diffstat (limited to 'setup_native/scripts/javaloader.sh')
-rw-r--r--setup_native/scripts/javaloader.sh27
1 files changed, 27 insertions, 0 deletions
diff --git a/setup_native/scripts/javaloader.sh b/setup_native/scripts/javaloader.sh
index 6a1a50e377c6..2488a8999c6d 100644
--- a/setup_native/scripts/javaloader.sh
+++ b/setup_native/scripts/javaloader.sh
@@ -318,6 +318,32 @@ find_rpm()
done
}
+check_architecture()
+{
+ # Check, if system and installation set fit together (x86 and sparc).
+ # If not, throw a warning.
+ # Architecture of the installation set is saved in file "installdata/xpd/setup.xpd"
+ # <architecture>sparc</architecture> or <architecture>i386</architecture>
+ # Architecture of system is determined with "uname -p"
+
+ setupxpdfile="installdata/xpd/setup.xpd"
+
+ if [ -f $setupxpdfile ]; then
+ platform=`uname -p` # valid values are "sparc" or "i386"
+ searchstring="<architecture>$platform</architecture>"
+ match=`cat $setupxpdfile | grep $searchstring`
+
+ if [ -z "$match" ]; then
+ # architecture does not fit, warning required
+ if [ "$platform" = "sparc" ]; then
+ echo "Warning: This is an attempt to install Solaris x86 packages on Solaris Sparc."
+ else
+ echo "Warning: This is an attempt to install Solaris Sparc packages on Solaris x86."
+ fi
+ fi
+ fi
+}
+
find_solaris_jre()
{
# searching for java runtime in path
@@ -387,6 +413,7 @@ if [ "$java_runtime_set" != "yes" ]; then
if [ "`uname -s`" = "Linux" ]; then
install_linux_rpm
elif [ "`uname -s`" = "SunOS" ]; then
+ check_architecture
find_solaris_jre
if [ "$java_runtime_found" = "yes" ]; then
check_jre_version