From c836a349e8473856b56885539e2e0133ca595171 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Petteri=20R=C3=A4ty?= Date: Sat, 17 Apr 2010 08:30:36 +0000 Subject: [PATCH] =?utf8?q?Add=20quotes=20around=20variables=20that=20could?= =?utf8?q?=20contain=20spaces=20in=20paths.=20Fixes=20bug=20#315961.=20Tha?= =?utf8?q?nks=20to=20Micha=C5=82=20G=C3=B3rny=20.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- eclass/java-vm-2.eclass | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/eclass/java-vm-2.eclass b/eclass/java-vm-2.eclass index 4d5905468a9a..fb3f20911c04 100644 --- a/eclass/java-vm-2.eclass +++ b/eclass/java-vm-2.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/java-vm-2.eclass,v 1.30 2010/03/27 22:23:57 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/java-vm-2.eclass,v 1.31 2010/04/17 08:30:36 betelgeuse Exp $ # ----------------------------------------------------------------------------- # @eclass-begin @@ -133,17 +133,17 @@ set_java_env() { -e "s/@PLATFORM@/${platform}/g" \ -e "s/@LIBDIR@/$(get_libdir)/g" \ -e "/^LDPATH=.*lib\\/\\\"/s|\"\\(.*\\)\"|\"\\1${platform}/:\\1${platform}/server/\"|" \ - < ${source_env_file} \ - > ${env_file} || die "sed failed" + < "${source_env_file}" \ + > "${env_file}" || die "sed failed" ( echo "VMHANDLE=\"${VMHANDLE}\"" echo "BUILD_ONLY=\"${JAVA_VM_BUILD_ONLY}\"" - ) >> ${env_file} + ) >> "${env_file}" [[ -n ${JAVA_PROVIDE} ]] && echo "PROVIDES=\"${JAVA_PROVIDE}\"" >> ${env_file} - local java_home=$(source ${env_file}; echo ${JAVA_HOME}) + local java_home=$(source "${env_file}"; echo ${JAVA_HOME}) [[ -z ${java_home} ]] && die "No JAVA_HOME defined in ${env_file}" # Make the symlink -- 2.26.2