[patch] Patch making 'show' display relative pathname

eselect-profile-show-relative.patch (text/plain), 1.34 KB, created by Thomas Bellman on 2008-11-23 23:26:37 UTC

--- ORIG-profile.eselect	2008-11-23 23:41:15.000000000 +0100
+++ profile.eselect	2008-11-23 23:45:45.000000000 +0100
@@ -81,13 +81,14 @@
 }
 
 do_show() {
 	write_list_start "Current make.profile symlink:"
 	if [[ -L "${ROOT}/etc/make.profile" ]] ; then
-		local link=$(canonicalise ${ROOT}/etc/make.profile)
+		local link=$(canonicalise "${ROOT}/etc/make.profile")
 		local portdir=$(portageq portdir)
-		link=${link##..${ROOT}/${portdir}/profiles/}
+		local profiledir=$(canonicalise "${ROOT}/${portdir}/profiles")
+		link=${link##${profiledir}/}
 		write_kv_list_entry "${link}" ""
 	else
 		write_kv_list_entry "(unset)" ""
 	fi
 }
@@ -97,17 +98,19 @@
 describe_list() {
 	echo "List available profile symlink targets"
 }
 
 do_list() {
-	local active targets
+	local portdir profiledir active targets
 	targets=( $(find_targets) )
 
 	[[ -z "${targets}" ]] && die -q "Failed to get a list of valid profiles"
 
-	active=$(canonicalise ${ROOT}/etc/make.profile)
-	active=${active##*profiles/}
+	portdir=$(portageq portdir)
+	profiledir=$(canonicalise "${ROOT}/${portdir}/profiles")
+	active=$(canonicalise "${ROOT}/etc/make.profile")
+	active=${active##${profiledir}/}
 	if [[ -n ${targets[@]} ]] ; then
 		local i
 		for (( i = 0 ; i < ${#targets[@]} ; i = i + 1 )) ; do
 			[[ ${targets[${i}]} == ${active} ]] \
 				&& targets[${i}]="${targets[${i}]} $(highlight '*' )"