[gentoo-commits] eselect r482 - in trunk: . modules

[Ulrich Mueller (ulm)]

Author: ulm
Date: 2009-04-21 06:56:46 +0000 (Tue, 21 Apr 2009)
New Revision: 482

Modified:
   trunk/ChangeLog
   trunk/modules/rc.eselect
Log:
Add --all option to show action of rc module.

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2009-04-20 21:16:26 UTC (rev 481)
+++ trunk/ChangeLog	2009-04-21 06:56:46 UTC (rev 482)
@@ -1,3 +1,8 @@
[phone]  Ulrich Mueller  <ulm@g.o>
+
+	* modules/rc.eselect (do_show): Add --all option.
+	(describe_show_options): Document it.
+
 2009-04-20  Ulrich Mueller  <ulm@g.o>
 
 	* libs/tests.bash.in (has): Quote $@ in order to expand positional

Modified: trunk/modules/rc.eselect
===================================================================
--- trunk/modules/rc.eselect	2009-04-20 21:16:26 UTC (rev 481)
+++ trunk/modules/rc.eselect	2009-04-21 06:56:46 UTC (rev 482)
@@ -215,6 +215,7 @@
 
 describe_show_options() {
 	echo "runlevels : Runlevels to list (defaults to current runlevel)"
+	echo "--all : List all runlevels"
 }
 
 do_show() {
@@ -224,14 +225,23 @@
 		# functions.sh needs the bash builtin
 		unset -f eval
 		source_rc_functions
-		[[ $# -eq 0 ]] && set - "$(get_runlevel)"
 
+		if [[ $# -eq 0 ]]; then
+			set - "$(get_runlevel)"
+		elif [[ $1 = --all ]]; then
+			for x in "${ROOT}"/etc/runlevels/*; do
+				[[ -d "${x}" ]] && runlevels=("${runlevels[@]}" "${x##*/}")
+			done
+			set - "${runlevels[@]}"
+		fi
+
 		for runlevel in "$@"; do
 			[[ -n ${runlevel} && -d ${ROOT}/etc/runlevels/${runlevel} ]] \
 				|| die -q "\"${runlevel}\" is no valid runlevel"
 
 			write_list_start \
 				"Status of init scripts in runlevel \"${runlevel}\""
+			n=0
 			for script in $(find_scripts "${ROOT}/etc/runlevels/${runlevel}")
 			do
 				status=unknown
@@ -253,7 +263,9 @@
 						write_kv_list_entry ${script} [${x}]
 						;;
 				esac
+				((n++))
 			done
+			[[ ${n} -eq 0 ]] && write_kv_list_entry "(none found)" ""
 		done
 	)
 }