From 6a54856cc446c0dff9e8f2b7a76f53ddeba63e8e Mon Sep 17 00:00:00 2001 From: Ivo Hinkelmann Date: Thu, 12 Jul 2007 10:18:55 +0000 Subject: 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 --- setup_native/scripts/javaloader.sh | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'setup_native/scripts') 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" + # sparc or i386 + # 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="$platform" + 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 -- cgit