commit: b3af201832a0781a907c02976056977e2cbd8219
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 30 21:09:25 2017 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Tue Jan 2 22:54:55 2018 +0000
URL: https://gitweb.gentoo.org/proj/eselect-java.git/commit/?id=b3af2018
Fix insufficient quoting in java-vm module
NEWS | 1 +
src/modules/java-vm.eselect.in | 24 ++++++++++++------------
2 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/NEWS b/NEWS
index c85ba17..8e0d519 100644
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,7 @@
* Fix mkdir die message in java-vm module
* Sort java-vm targets in version order rather than alphanumeric
* Fix showing and highlighting current ecj + mvn targets (#585224)
+ * Fix insufficient quoting in java-vm module
0.3.0:
diff --git a/src/modules/java-vm.eselect.in b/src/modules/java-vm.eselect.in
index 13da3f1..b9043e6 100644
--- a/src/modules/java-vm.eselect.in
+++ b/src/modules/java-vm.eselect.in
@@ -33,12 +33,12 @@ describe_show() {
do_show() {
if [[ ${1} == "system" ]]; then
- my_show ${VM_SYSTEM} 'system-vm'
+ my_show "${VM_SYSTEM}" 'system-vm'
elif [[ ${1} == "user" ]]; then
- my_show ${VM_USER} 'user-vm'
+ my_show "${VM_USER}" 'user-vm'
else
- my_show ${VM_SYSTEM} 'system-vm'
- my_show ${VM_USER} 'user-vm'
+ my_show "${VM_SYSTEM}" 'system-vm'
+ my_show "${VM_USER}" 'user-vm'
fi
}
@@ -65,11 +65,11 @@ do_list() {
if [[ -n ${targets[@]} ]] ; then
local i system_name user_name
- [[ -L ${VM_SYSTEM} ]] && system_name=$(sym_to_vm ${VM_SYSTEM})
- [[ -L ${VM_USER} ]] && user_name=$(sym_to_vm ${VM_USER})
+ [[ -L ${VM_SYSTEM} ]] && system_name=$(sym_to_vm "${VM_SYSTEM}")
+ [[ -L ${VM_USER} ]] && user_name=$(sym_to_vm "${VM_USER}")
for (( i = 0 ; i < ${#targets[@]} ; i = i + 1 )) ; do
- local build_only=$(grep 'BUILD_ONLY'
${VM_CONFIG}/${targets[${i}]} | cut -c 13-16 )
+ local build_only=$(grep 'BUILD_ONLY'
"${VM_CONFIG}/${targets[${i}]}" | cut -c 13-16 )
local mark=""
if [[ "${build_only}" == "TRUE" || "{build_only}" ==
"true" ]]; then
@@ -109,14 +109,14 @@ do_set() {
die -q ${usage}
elif [[ ${1} == "system" ]]; then
- if [[ -w $(dirname ${VM_SYSTEM}) ]]; then
- my_set ${VM_SYSTEM} ${2}
+ if [[ -w ${VM_SYSTEM%/*} ]]; then
+ my_set "${VM_SYSTEM}" "${2}"
else
die -q "Sorry, you don't have enough permission to set
system"
fi
elif [[ ${1} == "user" ]]; then
if [[ ${UID} != 0 ]]; then
- my_set ${VM_USER} ${2}
+ my_set "${VM_USER}" "${2}"
else
die -q "Sorry, you cannot set a user vm as root. Set
the system vm instead"
fi
@@ -133,7 +133,7 @@ my_set() {
elif [[ -L "${symlink}" ]] ; then
set_symlink "${target}" "${symlink}" || die -q "Couldn't set a
new symlink"
- elif [[ -e "${symlink}" ]] ; then
+ elif [[ -e ${symlink} ]] ; then
die -q "Target file already exists and is not a symlink:
${symlink}"
else
@@ -149,7 +149,7 @@ set_symlink() {
fi
if [[ -z ${target} ]] ; then
die -q "Target \"${1}\" doesn't appear to be valid!"
- elif [[ -d "${VM_BASE}/${target}" ]] ; then
+ elif [[ -d ${VM_BASE}/${target} ]] ; then
local sym_dir=${symlink%/*}
mkdir -p "${sym_dir}" || die -q "Could not create ${sym_dir}"
ln -snf "${VM_BASE}/${target}" "${symlink}"
