[gentoo-commits] eselect r394 - trunk/modules

[Ali Polatel (hawking)]

Author: hawking
Date: 2008-10-06 13:52:37 +0000 (Mon, 06 Oct 2008)
New Revision: 394

Modified:
   trunk/modules/vi.eselect
Log:
Fix for busybox, it's installed under /bin.

Modified: trunk/modules/vi.eselect
===================================================================
--- trunk/modules/vi.eselect	2008-10-06 13:41:40 UTC (rev 393)
+++ trunk/modules/vi.eselect	2008-10-06 13:52:37 UTC (rev 394)
@@ -58,7 +58,15 @@
 		targets=( $(find_targets ) )
 		target=${targets[$(( ${target} - 1 ))]}
 	fi
-	if [[ -f "${ROOT}/usr/bin/${target}" ]] ; then
+
+	local dir
+	if [[ ${target} == "busybox" ]]; then
+		dir="${ROOT}/bin"
+	else
+		dir="${ROOT}/usr/bin"
+	fi
+
+	if [[ -f "${dir}/${target}" ]] ; then
 		remove_symlinks
 
 		# it's okay if these fail
@@ -67,11 +75,11 @@
 		set_man_symlink "${target}" "view"
 
 		# it's not okay if these fail
-		ln -s "${ROOT}/usr/bin/${target}" "${ROOT}/usr/bin/vi" || \
+		ln -s "${dir}/${target}" "${ROOT}/usr/bin/vi" || \
 			die "Couldn't set ${target} /usr/bin/vi symlink"
-		ln -s "${ROOT}/usr/bin/${target}" "${ROOT}/usr/bin/ex" || \
+		ln -s "${dir}/${target}" "${ROOT}/usr/bin/ex" || \
 			die "Couldn't set ${target} /usr/bin/ex symlink"
-		ln -s "${ROOT}/usr/bin/${target}" "${ROOT}/usr/bin/view" || \
+		ln -s "${dir}/${target}" "${ROOT}/usr/bin/view" || \
 			die "Couldn't set ${target} /usr/bin/view symlink"
 	else
 		die -q  "Target \"${1}\" doesn't appear to be valid!"