[gentoo-commits] eselect r785 - trunk/extern/modules

[Chi-Thanh Christopher Nguyen (chithanh)]

Author: chithanh
Date: 2010-11-27 04:02:29 +0000 (Sat, 27 Nov 2010)
New Revision: 785

Modified:
   trunk/extern/modules/mesa.eselect
Log:
Update mesa.eselect with comments from gentoo-devel, thanks to fauli for suggestions

Modified: trunk/extern/modules/mesa.eselect
===================================================================
--- trunk/extern/modules/mesa.eselect	2010-11-26 16:53:53 UTC (rev 784)
+++ trunk/extern/modules/mesa.eselect	2010-11-27 04:02:29 UTC (rev 785)
@@ -6,25 +6,26 @@
 MAINTAINER="x11@g.o"
 SVN_DATE='$Date: $'
 VERSION=$(svn_date_to_version "${SVN_DATE}" )
-EBUILD_VERSION="0.0.7"
+EBUILD_VERSION="0.0.8"
 
-CONFIG_DIR="${EROOT}/usr/share/mesa"
+MESA_CONF_DIR="${EROOT}/usr/share/mesa"
 MESA_DIR="${EROOT}/usr/lib/mesa"
 DRI_DIR="${EROOT}/usr/lib/dri"
 
-source "${CONFIG_DIR}"/eselect-mesa.conf || die "Failed to source config"
+source "${MESA_CONF_DIR}"/eselect-mesa.conf || die "Failed to source config"
 
 # receives a filename of the driver as argument, outputs the architecture (classic or gallium)
 drivername_to_architecture() {
 	local drivername=$1
-	local x
-	local y
-	local z
-	for x in ${MESA_IMPLEMENTATIONS}; do
-		for y in classic gallium; do
-			z=$(get_drivername ${x} ${y})
-			if [[ ${drivername} == ${z} ]]; then
-				echo ${y}
+	local driver
+	local implementation
+	local comp
+	for driver in ${MESA_IMPLEMENTATIONS}; do
+		for implementation in classic gallium; do
+			comp=$(get_drivername ${driver} ${implementation})
+			# check if the driver name matches the parameter
+			if [[ ${drivername} == ${comp} ]]; then
+				echo ${implementation}
 				exit 0
 			fi
 		done
@@ -41,31 +42,37 @@
 # receives the chipset family as argument, outputs the currently selected architecture for that family
 get_current_implementation() {
 	local family=$1
-	local y
-	local z
+	local implementation
+	local drivername
+	# the symlink is named the same as the classic driver
 	local current=$(get_drivername ${family} classic)
 
 	if [[ -L ${DRI_DIR}/${current} ]]; then
-		for y in classic gallium; do
-			z=$(get_drivername ${family} ${y})
-			if [[ $(readlink ${DRI_DIR}/${current}) == "../mesa/${z}" && -f "${MESA_DIR}/${z}" ]]; then
-				echo $(drivername_to_architecture ${z})
+		for implementation in classic gallium; do
+			drivername=$(get_drivername ${family} ${implementation})
+			# read the symlink which points to the actual driver file
+			if [[ $(readlink ${DRI_DIR}/${current}) == "../mesa/${drivername}" && -f "${MESA_DIR}/${drivername}" ]]; then
+				echo $(drivername_to_architecture ${drivername})
 			fi
 		done
 	elif [[ -f ${DRI_DIR}/${current} ]]; then
+		# if it is a file, assume classic
 		echo "classic"
 	fi
 }
 
-# receives a family as argument, outputs all installed driver filenames
+# receives a family as argument, outputs all installed implementations
 get_implementations() {
 	local ret
 	local family=$1
-	local y
-	local z
-	for y in classic gallium; do
-		z=$(get_drivername ${family} ${y})
-		[ -f ${MESA_DIR}/${z} -o -L ${MESA_DIR}/${z} ] && ret+="${y} "
+	local implementation
+	local drivername
+	# check which driver files exist in MESA_DIR
+	for implementation in classic gallium; do
+		drivername=$(get_drivername ${family} ${implementation})
+		if [[ -f ${MESA_DIR}/${drivername} || -L ${MESA_DIR}/${drivername} ]]; then
+			ret+="${implementation} "
+		fi
 	done
 	echo ${ret}
 }
@@ -77,12 +84,11 @@
 
 do_show() {
 	local current
-	local x
-	local y
-	for x in ${MESA_IMPLEMENTATIONS}; do
-		current=$(get_current_implementation ${x})
+	local driver
+	for driver in ${MESA_IMPLEMENTATIONS}; do
+		current=$(get_current_implementation ${driver})
 		if [[ -n ${current} ]]; then
-			echo -n "${x} "
+			echo -n "${driver} "
 			echo ${current}
 		fi
 	done
@@ -95,20 +101,19 @@
 }
 
 do_list() {
-	local x
-	local y
-	local z
+	local driver
 	local available
 
-	for x in ${MESA_IMPLEMENTATIONS}; do
-		write_list_start ${MESA_DRIVERS[${x},description]}
-		available=( $(get_implementations ${x}) )
+	# assemble the list of drivers with the installed implementations
+	for driver in ${MESA_IMPLEMENTATIONS}; do
+		write_list_start ${MESA_DRIVERS[${driver},description]}
+		available=( $(get_implementations ${driver}) )
 		for (( i = 0 ; i < ${#available[@]} ; i = i + 1 )); do
-			if [[ ${available[${i}]} == $(get_current_implementation ${x}) ]]; then
+			if [[ ${available[${i}]} == $(get_current_implementation ${driver}) ]]; then
 				available[${i}]=$(highlight_marker "${available[${i}]}")
 			fi
-			write_kv_list_entry "${available[${i}]}"
 		done
+		write_numbered_list "${available[@]}"
 	done
 }
 
@@ -129,15 +134,16 @@
 
 do_set() {
 	if [[ "$1" == --auto ]]; then
-		local x
-		for x in ${MESA_IMPLEMENTATIONS}; do
-			local y=( $(get_implementations ${x}) )
-			# prefer default implementation
-			if [[ ${y[1]} == ${MESA_DRIVERS[${x},default]} ]]; then
-				y=${y[1]}
+		local driver
+		for driver in ${MESA_IMPLEMENTATIONS}; do
+			local implementations=( $(get_implementations ${driver}) )
+			# prefer default implementation if installed
+			if [[ ${implementations[1]} == ${MESA_DRIVERS[${driver},default]} ]]; then
+				implementations=${implementations[1]}
 			fi
-			if [[ -n ${y} && ! -n $(get_current_implementation ${x}) ]]; then
-				do_set ${x} ${y}
+			# set the implementation if it is not already set
+			if [[ -n ${implementations} && ! -n $(get_current_implementation ${driver}) ]]; then
+				do_set ${driver} ${implementations}
 			fi
 		done
 		exit 0
@@ -147,6 +153,16 @@
 
 	local family=$(echo $1 | tr '[:upper:]' '[:lower:]')
 	local architecture=$(echo $2 | tr '[:upper:]' '[:lower:]')
+
+	# architecture may be specified by its name or its index
+	if is_number "${architecture}"; then
+		# numeric index, find the architecture's name
+		local implementations=( $(get_implementations ${family} ${architecture}) )
+		[[ ${architecture} -ge 1 && ${architecture} -le ${#implementations[@]} ]] \
+			|| die -q "Number out of range: ${architecture}"
+		architecture=${implementations[architecture-1]}
+	fi
+
 	local symlink=$(get_drivername ${family} classic)
 	local target=$(get_drivername ${family} ${architecture})
 
@@ -155,7 +171,7 @@
 	elif [[ -e ${DRI_DIR}/${symlink} && ! -L ${DRI_DIR}/${symlink} ]]; then
 		die -q "Unable to update ${DRI_DIR}/${symlink} - not a symlink"
 	elif [[ -f ${MESA_DIR}/${target} ]]; then
-		echo "Switching $1 to $2"
+		echo "Switching ${family} to ${architecture}"
 		ln -s -f ../mesa/${target} ${DRI_DIR}/${symlink}
 	fi
 }