X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=extras%2Flttng-bash_completion;h=bff8df724276992d02d714e31ebc4b28d4380b80;hp=efd5f58e35a74adce631d7e75ea1940432f0e403;hb=5d9ad61212d307697bb661bafcf16356fea915ac;hpb=651adb86f32459e91d03a2ead36eb147ac2eea77

diff --git a/extras/lttng-bash_completion b/extras/lttng-bash_completion
index efd5f58e3..bff8df724 100644
--- a/extras/lttng-bash_completion
+++ b/extras/lttng-bash_completion
@@ -16,11 +16,16 @@
 #
 
 _lttng_complete_sessions() {
-	# TODO, maybe have a lttng list --simple or something like that
+	# TODO
+	# This code does nothing for now. When there is a mecanism to get the
+	# existing sessions, use it to fill the sessions variable.
+	local sessions
+	sessions=""
+	COMPREPLY=( $(compgen -W "${sessions}" -- $cur) )
 	return
 }
 
-_lttng_cmd_add_context() {
+_lttng_cmd_addcontext() {
 	local add_context_opts
 	add_context_opts=$(lttng add-context --list-options)
 
@@ -125,44 +130,6 @@ _lttng_cmd_enableevent() {
 	esac
 }
 
-_lttng_cmd_enableconsumer() {
-	local enable_consumer_opts
-		enable_consumer_opts=$(lttng enable-consumer --list-options)
-
-	case $prev in
-	--session|-s)
-		_lttng_complete_sessions
-		return
-		;;
-	esac
-
-	case $cur in
-	-*)
-		COMPREPLY=( $(compgen -W "${enable_consumer_opts}" -- $cur) )
-		return
-		;;
-	esac
-}
-
-_lttng_cmd_disableconsumer() {
-	local disable_consumer_opts
-		disable_consumer_opts=$(lttng disable-consumer --list-options)
-
-	case $prev in
-	--session|-s)
-		_lttng_complete_sessions
-		return
-		;;
-	esac
-
-	case $cur in
-	-*)
-		COMPREPLY=( $(compgen -W "${disable_consumer_opts}" -- $cur) )
-		return
-		;;
-	esac
-}
-
 _lttng_cmd_disablechannel() {
 	local disable_channel_opts
 	disable_channel_opts=$(lttng disable-channel --list-options)
@@ -182,9 +149,9 @@ _lttng_cmd_disablechannel() {
 	esac
 }
 
-_lttng_cmd_disable_event() {
+_lttng_cmd_disableevent() {
 	local disable_event_opts
-	disable_channel_opts=$(lttng disable-event --list-options)
+	disable_event_opts=$(lttng disable-event --list-options)
 
 	case $prev in
 	--session|-s)
@@ -219,10 +186,13 @@ _lttng_cmd_list() {
 		COMPREPLY=( $(compgen -W "${list_opts}" -- $cur) )
 		return
 		;;
+	*)
+		_lttng_complete_sessions
+		return
 	esac
 }
 
-_lttng_cmd_set_session() {
+_lttng_cmd_setsession() {
 	local set_session_opts
 	set_session_opts=$(lttng set-session --list-options)
 
@@ -231,6 +201,10 @@ _lttng_cmd_set_session() {
 		COMPREPLY=( $(compgen -W "${set_session_opts}" -- $cur) )
 		return
 		;;
+	*)
+		_lttng_complete_sessions
+		return
+		;;
 	esac
 }