commit: de894fa54f08e5adf3339e717e5d6ac3baf9e0bb
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 28 21:46:15 2017 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Tue Jan 2 22:54:52 2018 +0000
URL: https://gitweb.gentoo.org/proj/eselect-java.git/commit/?id=de894fa5
Fix mkdir die message in java-vm module
NEWS | 1 +
src/modules/java-vm.eselect.in | 8 +++-----
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/NEWS b/NEWS
index 669548f..3faaf11 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,7 @@
0.4.0:
* Don't emit (unset) or (not a symlink) on stderr (#549498)
+ * Fix mkdir die message in java-vm module
0.3.0:
diff --git a/src/modules/java-vm.eselect.in b/src/modules/java-vm.eselect.in
index c964a34..3d5de4d 100644
--- a/src/modules/java-vm.eselect.in
+++ b/src/modules/java-vm.eselect.in
@@ -1,5 +1,5 @@
# -*-eselect-*- vim: ft=eselect
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
DESCRIPTION="Manage the Java system and user VM"
@@ -147,10 +147,8 @@ set_symlink() {
if [[ -z ${target} ]] ; then
die -q "Target \"${1}\" doesn't appear to be valid!"
elif [[ -d "${VM_BASE}/${target}" ]] ; then
- local sym_dir=$(dirname ${symlink})
- if [[ ! -d ${sym_dir} ]]; then
- mkdir -p ${sym_dir} || die -q "Could not create
${my_dir}"
- fi
+ local sym_dir=${symlink%/*}
+ mkdir -p "${sym_dir}" || die -q "Could not create ${sym_dir}"
ln -snf "${VM_BASE}/${target}" "${symlink}"
else
die -q "Target \"${1}\" doesn't appear to be valid!"
