Attachment #72702 for bug #111963

View | Details | Raw Unified | Return to bug 111963 | Differences between
Collapse All | Expand All





# Thanks to Meikel Bisping for his contributions.  -- Blaine

# Gentoo specific - make sure that 'java' executable is present in PATH,
# so the following 'which java' wouldn't fail. (resolves Bug #103024)
if [ -z "$(which java 2>/dev/null)" ]; then
    NOWPATH=${PATH}
    for E in $(find /etc/env.d -type f -name *java); do
        source ${E}
	if [ "${NOWPATH}" != "${PATH}" ]; then
	    PATH=${NOWPATH}:${PATH}
	fi
    done
    unset E
    unset NOWPATH
    export PATH
fi

JAVA_EXECUTABLE=$(which java 2>/dev/null)

# Unless you copied a hsqldb.jar file from another system, this typically

Return to bug 111963

Lines 16-21 Link Here

(-)hsqldb.orig (+15 lines)
16		16
17	# Thanks to Meikel Bisping for his contributions. -- Blaine	17	# Thanks to Meikel Bisping for his contributions. -- Blaine
18		18
		19	# Gentoo specific - make sure that 'java' executable is present in PATH,
		20	# so the following 'which java' wouldn't fail. (resolves Bug #103024)
		21	if [ -z "$(which java 2>/dev/null)" ]; then
		22	NOWPATH=${PATH}
		23	for E in $(find /etc/env.d -type f -name *java); do
		24	source ${E}
		25	if [ "${NOWPATH}" != "${PATH}" ]; then
		26	PATH=${NOWPATH}:${PATH}
		27	fi
		28	done
		29	unset E
		30	unset NOWPATH
		31	export PATH
		32	fi
		33
19	JAVA_EXECUTABLE=$(which java 2>/dev/null)	34	JAVA_EXECUTABLE=$(which java 2>/dev/null)
20		35
21	# Unless you copied a hsqldb.jar file from another system, this typically	36	# Unless you copied a hsqldb.jar file from another system, this typically