stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

7099454: /bin/sh does not support syntax used in the src/os/posix/launcher/launcher.script shell script

Browse Source 
Also reviewed by mikael.gerdin@oracle.com; Changed to the `` syntax instead. Also changed "source" to ".".

Reviewed-by: never, stefank, dsamersoff, rottenha
This commit is contained in:
Bengt Rutisson 2011-10-11 10:21:36 +02:00
parent 8fbb0e0f4a
commit 7fa7f8a597
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
hotspot/src/os/posix/launcher/launcher.script
View File

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
# #
# This code is free software; you can redistribute it and/or modify it # This code is free software; you can redistribute it and/or modify it
@ -69,8 +69,8 @@ EMACS=emacs
# #
# Make sure the paths are fully specified, i.e. they must begin with /. # Make sure the paths are fully specified, i.e. they must begin with /.
SCRIPT=$(cd $(dirname $0) && pwd)/$(basename $0) REL_MYDIR=`dirname $0`
RUNDIR=$(pwd) MYDIR=`cd $REL_MYDIR && pwd`
# Look whether the user wants to run inside gdb # Look whether the user wants to run inside gdb
case "$1" in case "$1" in
@ -95,12 +95,9 @@ case "$1" in
;; ;;
esac esac
# Find out the absolute path to this script
MYDIR=$(cd $(dirname $SCRIPT) && pwd)
JDK= JDK=
if [ "${ALT_JAVA_HOME}" = "" ]; then if [ "${ALT_JAVA_HOME}" = "" ]; then
source ${MYDIR}/jdkpath.sh . ${MYDIR}/jdkpath.sh
else else
JDK=${ALT_JAVA_HOME%%/jre}; JDK=${ALT_JAVA_HOME%%/jre};
fi fi
@ -119,9 +116,6 @@ JRE=$JDK/jre
JAVA_HOME=$JDK JAVA_HOME=$JDK
ARCH=@@LIBARCH@@ ARCH=@@LIBARCH@@
# Find out the absolute path to this script
MYDIR=$(cd $(dirname $SCRIPT) && pwd)
SBP=${MYDIR}:${JRE}/lib/${ARCH} SBP=${MYDIR}:${JRE}/lib/${ARCH}
# Set up a suitable LD_LIBRARY_PATH # Set up a suitable LD_LIBRARY_PATH
@ -146,7 +140,7 @@ if [ ! -x $LAUNCHER ] ; then
fi fi
GDBSRCDIR=$MYDIR GDBSRCDIR=$MYDIR
BASEDIR=$(cd $MYDIR/../../.. && pwd) BASEDIR=`cd $MYDIR/../../.. && pwd`
init_gdb() { init_gdb() {
# Create a gdb script in case we should run inside gdb # Create a gdb script in case we should run inside gdb
@ -179,7 +173,7 @@ case "$MODE" in
init_gdb init_gdb
# First find out what emacs version we're using, so that we can # First find out what emacs version we're using, so that we can
# use the new pretty GDB mode if emacs -version >= 22.1 # use the new pretty GDB mode if emacs -version >= 22.1
case $($EMACS -version 2> /dev/null) in case `$EMACS -version 2> /dev/null` in
*GNU\ Emacs\ 2[23]*) *GNU\ Emacs\ 2[23]*)
emacs_gud_cmd="gdba" emacs_gud_cmd="gdba"
emacs_gud_args="--annotate=3" emacs_gud_args="--annotate=3"