Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 315691
Collapse All | Expand All

(-)eclass/java-vm-2.eclass.orig (-4 / +4 lines)
Lines 133-149 set_java_env() { Link Here
133
		-e "s/@PLATFORM@/${platform}/g" \
133
		-e "s/@PLATFORM@/${platform}/g" \
134
		-e "s/@LIBDIR@/$(get_libdir)/g" \
134
		-e "s/@LIBDIR@/$(get_libdir)/g" \
135
		-e "/^LDPATH=.*lib\\/\\\"/s|\"\\(.*\\)\"|\"\\1${platform}/:\\1${platform}/server/\"|" \
135
		-e "/^LDPATH=.*lib\\/\\\"/s|\"\\(.*\\)\"|\"\\1${platform}/:\\1${platform}/server/\"|" \
136
		< ${source_env_file} \
136
		< "${source_env_file}" \
137
		> ${env_file} || die "sed failed"
137
		> "${env_file}" || die "sed failed"
138
138
139
	(
139
	(
140
		echo "VMHANDLE=\"${VMHANDLE}\""
140
		echo "VMHANDLE=\"${VMHANDLE}\""
141
		echo "BUILD_ONLY=\"${JAVA_VM_BUILD_ONLY}\""
141
		echo "BUILD_ONLY=\"${JAVA_VM_BUILD_ONLY}\""
142
	) >> ${env_file}
142
	) >> "${env_file}"
143
143
144
	[[ -n ${JAVA_PROVIDE} ]] && echo "PROVIDES=\"${JAVA_PROVIDE}\"" >> ${env_file}
144
	[[ -n ${JAVA_PROVIDE} ]] && echo "PROVIDES=\"${JAVA_PROVIDE}\"" >> ${env_file}
145
145
146
	local java_home=$(source ${env_file}; echo ${JAVA_HOME})
146
	local java_home=$(source "${env_file}"; echo ${JAVA_HOME})
147
	[[ -z ${java_home} ]] && die "No JAVA_HOME defined in ${env_file}"
147
	[[ -z ${java_home} ]] && die "No JAVA_HOME defined in ${env_file}"
148
148
149
	# Make the symlink
149
	# Make the symlink

Return to bug 315691