[gentoo-commits] proj/lua:master commit in: app-eselect/eselect-luajit/files/, app-eselect/eselect-lua/files/

[gentoo-commits] proj/lua:master commit in: app-eselect/eselect-luajit/files/, app-eselect/eselect-lua/files/

[Vadim A. Misbakh-Soloviov]

commit:     6adf250de6a41b9a1fa36e1f85a1f1bbedcc4786
Author:     Vadim A. Misbakh-Soloviov <git <AT> mva <DOT> name>
AuthorDate: Sat Apr  4 11:45:23 2015 +0000
Commit:     Vadim A. Misbakh-Soloviov <mva <AT> mva <DOT> name>
CommitDate: Sat Apr  4 11:45:23 2015 +0000
URL:        https://gitweb.gentoo.org/proj/lua.git/commit/?id=6adf250d

[app-eselect/lua{,jit}] Some fixes

Signed-off-by: Vadim A. Misbakh-Soloviov <git <AT> mva.name>

 app-eselect/eselect-lua/files/lua.eselect-2       | 4 ++--
 app-eselect/eselect-luajit/files/luajit-1.eselect | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app-eselect/eselect-lua/files/lua.eselect-2 b/app-eselect/eselect-lua/files/lua.eselect-2
index 87681e0..d3f67ad 100644
--- a/app-eselect/eselect-lua/files/lua.eselect-2
+++ b/app-eselect/eselect-lua/files/lua.eselect-2
@@ -52,7 +52,7 @@ find_targets() {
 	local dirs
 	local prefix="${EROOT}/usr/bin/lua"
 	for f in ${prefix}{5,jit-2}* ; do
-		dirs="${dirs} ${f##$prefix}"
+		[[ -f "${f}" ]] && dirs="${dirs} ${f##$prefix}"
 	done
 	echo $dirs
 }
@@ -67,7 +67,7 @@ resolv_target() {
 }
 
 get_active_version() {
-	readlink -e "${EROOT}"/usr/bin/lua | sed -ne "s:.*/usr/bin/lua\([\d.-]*\):\1:p"
+	readlink -e "${EROOT}"/usr/bin/lua | sed -ne "s:.*/usr/bin/lua\([\w.-]*\):\1:p"
 }
 
 ## Actual actions

diff --git a/app-eselect/eselect-luajit/files/luajit-1.eselect b/app-eselect/eselect-luajit/files/luajit-1.eselect
index fdd1e8d..3e6f376 100644
--- a/app-eselect/eselect-luajit/files/luajit-1.eselect
+++ b/app-eselect/eselect-luajit/files/luajit-1.eselect
@@ -22,7 +22,7 @@ sort_luajit_versions() {
 find_targets() {
 	local f
 	for f in $(find "${EROOT}"/usr/bin/ -type f -iname 'luajit-[[:digit:]]*'); do
-	basename "${f}"
+		basename "${f}"
 	done | sort_luajit_versions
 }