summaryrefslogtreecommitdiffstats
path: root/pki/base/java-tools/templates/pki_java_command_wrapper
diff options
context:
space:
mode:
Diffstat (limited to 'pki/base/java-tools/templates/pki_java_command_wrapper')
-rw-r--r--pki/base/java-tools/templates/pki_java_command_wrapper9
1 files changed, 7 insertions, 2 deletions
diff --git a/pki/base/java-tools/templates/pki_java_command_wrapper b/pki/base/java-tools/templates/pki_java_command_wrapper
index 5fdf4662..d92bf3e6 100644
--- a/pki/base/java-tools/templates/pki_java_command_wrapper
+++ b/pki/base/java-tools/templates/pki_java_command_wrapper
@@ -64,10 +64,10 @@ invalid_architecture() {
## search order this command wrapper uses to find shared libraries. ##
###############################################################################
-OS=`pkiname`
-ARCHITECTURE=`pkiarch`
+OS=`uname -s`
if [ "${OS}" = "Linux" ] ; then
+ ARCHITECTURE=`uname -i`
JAVA="java"
JAVA_OPTIONS=""
@@ -89,6 +89,11 @@ if [ "${OS}" = "Linux" ] ; then
exit 255
fi
elif [ "${OS}" = "SunOS" ] ; then
+ ARCHITECTURE=`uname -p`
+ if [ "${ARCHITECTURE}" = "sparc" ] &&
+ [ -d "/usr/lib/sparcv9/" ] ; then
+ ARCHITECTURE="sparcv9"
+ fi
if [ "${ARCHITECTURE}" = "sparc" ] ; then
JAVA="/usr/jdk/instances/jdk1.5.0/jre/bin/java"
JAVA_OPTIONS=""