|
Line
Link Here
|
| 0 |
-- 1/src/java-config-2.sh.in |
0 |
++ 1/src/java-config-2.sh.in |
|
Lines 9-21
Link Here
|
| 9 |
# See https://bugs.gentoo.org/show_bug.cgi?id=169925 |
9 |
# See https://bugs.gentoo.org/show_bug.cgi?id=169925 |
| 10 |
# for more details" |
10 |
# for more details" |
| 11 |
|
11 |
|
| 12 |
if [ -z "${UID}" ] ; then |
12 |
if [ -z "${UID-}" ] ; then |
| 13 |
# id lives in /usr/bin which might not be mounted |
13 |
# id lives in /usr/bin which might not be mounted |
| 14 |
if type id >/dev/null 2>/dev/null ; then |
14 |
if type id >/dev/null 2>/dev/null ; then |
| 15 |
user_id=$(id -u) |
15 |
user_id=$(id -u) |
| 16 |
else |
16 |
else |
| 17 |
[ "${USER}" = "root" ] && user_id=0 |
17 |
[ "${USER-}" = "root" ] && user_id=0 |
| 18 |
fi |
18 |
fi |
|
|
19 |
else user_id=${UID} |
| 19 |
fi |
20 |
fi |
| 20 |
|
21 |
|
| 21 |
# The root user uses the system vm |
22 |
# The root user uses the system vm |
|
Lines 27-33
Link Here
|
| 27 |
fi |
28 |
fi |
| 28 |
|
29 |
|
| 29 |
# prepending to come before generation 1 |
30 |
# prepending to come before generation 1 |
| 30 |
export MANPATH="${JAVA_HOME}/man:${MANPATH}" |
31 |
export MANPATH="${JAVA_HOME}/man${MANPATH:+:}${MANPATH-}" |
| 31 |
export JDK_HOME=${JAVA_HOME} |
32 |
export JDK_HOME="${JAVA_HOME}" |
| 32 |
export JAVAC=${JDK_HOME}/bin/javac |
33 |
export JAVAC="${JDK_HOME}/bin/javac" |
| 33 |
unset gentoo_user_vm gentoo_system_vm user_id |
34 |
unset gentoo_user_vm gentoo_system_vm user_id |
