etc/completions/: Use value/argument descriptions

3 files changed, 34 insertions, 31 deletions

diff --git a/etc/completions/_envstore b/etc/completions/_envstore
index 9e269eb..4bd251c 100644
--- a/etc/completions/_envstore
+++ b/etc/completions/_envstore
@@ -4,11 +4,11 @@
 local values
 
 values=(
-	'clear'
-	'eval'
-	'rm'
-	'save'
-	'show'
-	''
+	# TODO there must be a better solution, like (*)clear...
+	'(eval rm save show)clear[Clear saved variables]'
+	'(clear rm save show)eval[Produce output for evaluation]'
+	'(clear eval save show)rm[Remove variable]:variable'
+	'(clear eval rm show)save[Save variable]:variable'
+	'(clear eval rm save)show[Show saved variables]'
 )
-_values -w -s ' ' 'envstore' $values
+_values -s ' ' -S ' ' -w 'envstore' $values
diff --git a/etc/completions/_lighty-stats b/etc/completions/_lighty-stats
index c27a941..b3f65b9 100644
--- a/etc/completions/_lighty-stats
+++ b/etc/completions/_lighty-stats
@@ -14,14 +14,15 @@ arguments=(
 	'(--show-hosts)--no-show-hosts'
 	'(--show-status)--no-show-status'
 	'(--show-sites)--no-show-sites'
-	'*--format'
-	'--bytes'
-	'--count=-'
-	'--match=-'
-	'--ignore=-'
-	'--pathlength=-'
-	'--width=-'
-	'--log-format=-'
+#	'*--format:::(title= line_even= line_uneven=)'
+	'*--format[Output format]'
+	'--bytes[Count in bytes instead of hits]'
+	'--count=-[How many items to display]'
+	'--match=-[Only show lines matching this]'
+	'--ignore=-[Ignore lines matching this]'
+	'--pathlength=-[Trim paths]'
+	'--width=-[Display width]'
+	'--log-format=-[logfile format]:::(lighttpd vsftpd)'
 	'*:file:_files'
 )
 
diff --git a/etc/completions/_pkg b/etc/completions/_pkg
index 129197c..5d95860 100644
--- a/etc/completions/_pkg
+++ b/etc/completions/_pkg
@@ -4,25 +4,27 @@
 local values
 local arguments
 
+#TODO: seperate values that need arguments from those that don't,
+# make this all nicer in general
 values=(
-	'add'
-	'changelog'
-	'changeroot'
-	'delete'
-	'info'
-	'install'
-	'list'
-	'list-all'
-	'local-update'
-	'log'
-	'remote-update'
-	'remove'
-	'status'
-	'update'
-	'upgrade'
+	'add[install package]'
+	'changelog[show changelog of package]'
+	'changeroot[change default url for al packages]'
+	'delete[remove package]'
+	'info[show package info]'
+	'install[install package]'
+	'list[list installed packages]'
+	'list-all[list remote available packages]'
+	'local-update[update local packages list]'
+	'log[show package log]'
+	'remote-update[update remote pckages list]'
+	'remove[remove package]'
+	'status[check packages dependencies etc]'
+	'update[update packages lists]'
+	'upgrade[upgrade packages]'
 )
 arguments=(
 	'*:file:_path_files -W /home/derf/packages -/'
 )
-_values -w -s ' ' 'pkg function' $values
+_values -s ' ' -S ' ' -w 'pkg function' $values
 _arguments -s $arguments