mirror of
git://git.code.sf.net/p/zsh/code
synced 2025-07-20 07:41:04 +02:00
33481: resolve completion clashes and tidy-up SUSE/Mandriva related functions
This commit is contained in:
Oliver Kiddle
parent
e02ff159b3
commit
af9f623273
8 changed files with 40 additions and 71 deletions
ChangeLog
Completion
|
|
@ -1,3 +1,11 @@
|
|||
2014-10-21 Oliver Kiddle <opk@zsh.org>
|
||||
|
||||
* 33481: Completion/Mandriva/Command/_rebootin,
|
||||
Completion/Unix/Type/_directories, Completion/Unix/Type/_pdf,
|
||||
Completion/Unix/Type/_pids, Completion/openSUSE/Command/_yast,
|
||||
Completion/openSUSE/Command/_SUSEconfig: resolve completion
|
||||
clashes and tidy-up SUSE/Mandriva related functions
|
||||
|
||||
2014-10-17 Peter Stephenson <p.stephenson@samsung.com>
|
||||
|
||||
* see 33475: Completion/Unix/Command/_gcc: allow .cpp files as
|
||||
|
|
|
|||
|
|
@ -1,27 +1,29 @@
|
|||
#compdef rebootin
|
||||
|
||||
local context state line expl
|
||||
typeset -A opt_args
|
||||
local loader=$(sudo detectloader -q)
|
||||
|
||||
_arguments -C -s \
|
||||
_arguments -s \
|
||||
'-n[no immediate reboot just set the flags for next reboot]' \
|
||||
'-f[create a /fastboot file to reboot in fastboot mode]' \
|
||||
'*::arguments:->loader_entry'
|
||||
|
||||
local expl
|
||||
case $state in
|
||||
loader_entry)
|
||||
case $loader in
|
||||
GRUB)
|
||||
if [ -r /boot/grub/menu.lst ];then
|
||||
compadd ${${(M)${(f)"$(</boot/grub/menu.lst)"}##title *}#title }
|
||||
fi
|
||||
;;
|
||||
LILO)
|
||||
if [ -r /etc/lilo.conf ];then
|
||||
compadd $(awk -F= '{ if ($0 ~ /label=/) print $2 }' /etc/lilo.conf)
|
||||
fi
|
||||
;;
|
||||
*)
|
||||
;;
|
||||
esac
|
||||
loader_entry)
|
||||
case $loader in
|
||||
GRUB)
|
||||
if [ -r /boot/grub/menu.lst ]; then
|
||||
_wanted -C $context entries expl entry \
|
||||
compadd ${${(M)${(f)"$(</boot/grub/menu.lst)"}##title *}#title }
|
||||
fi
|
||||
;;
|
||||
LILO)
|
||||
if [ -r /etc/lilo.conf ]; then
|
||||
_wanted -C $context entries expl entry \
|
||||
compadd $(awk -F= '{ if ($0 ~ /label=/) print $2 }' /etc/lilo.conf)
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
esac
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
#compdef rmdir df dircmp -P -value-,*path,-default-
|
||||
#compdef rmdir dircmp -P -value-,*path,-default-
|
||||
|
||||
local expl
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
#compdef pdf2dsc pdf2ps pdfimages pdfinfo pdftopbm pdftops pdftotext pdfopt pdffonts kpdf apvlv evince epdfview
|
||||
#compdef pdf2dsc pdf2ps pdfimages pdfinfo pdftopbm pdftops pdftotext pdfopt pdffonts kpdf apvlv epdfview
|
||||
|
||||
local expl ext=''
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
#compdef pflags pcred pmap pldd psig pstack pfiles pwdx pstop prun pwait ptree
|
||||
#compdef pflags pcred pmap pldd psig pstack pfiles pwdx pstop prun pwait
|
||||
|
||||
# If given the `-m <pattern>' option, this tries to complete only pids
|
||||
# of processes whose command line match the `<pattern>'.
|
||||
|
|
|
|||
|
|
@ -1,15 +1,7 @@
|
|||
#compdef SuSEconfig
|
||||
|
||||
local curcontext="$curcontext" state line
|
||||
typeset -A opt_args
|
||||
|
||||
if [[ -z "$_SuSEconfig_modules" ]]; then
|
||||
for i in /sbin/conf.d/SuSEconfig.*; do
|
||||
case $i in *.rpm*|*.swap|*.bak|*.orig|*~|\#*) continue;; esac
|
||||
_SuSEconfig_modules=($_SuSEconfig_modules ${i##*/SuSEconfig.})
|
||||
done
|
||||
fi
|
||||
|
||||
local modules
|
||||
modules=( /sbin/conf.d/SuSEconfig.*~(*.rpm*|*.swap|*.bak|*.orig|*~|\#*)(N:e) )
|
||||
|
||||
_arguments \
|
||||
'--help' \
|
||||
|
|
@ -17,12 +9,6 @@ _arguments \
|
|||
'--force' \
|
||||
'--verbose' \
|
||||
'--nonewpackage' \
|
||||
'--module:module:->module' && return 0
|
||||
|
||||
case $state in
|
||||
module) compadd $_SuSEconfig_modules ;;
|
||||
esac
|
||||
|
||||
# Usage: SuSEconfig [--quick|--nonewpackage|--force|--verbose] [--module name]
|
||||
|
||||
|
||||
'-norestarts' \
|
||||
'-nomodule' \
|
||||
'--module:module:compadd -a modules'
|
||||
|
|
|
|||
|
|
@ -3,9 +3,12 @@
|
|||
_arguments \
|
||||
'(- 1)'{-h,--help}'[display help information]' \
|
||||
'(- 1)'{-l,--list}'[list all available modules]' \
|
||||
'(-g --geometry)'{-g,--geometry}'[specify default window size]:_x_geometry' \
|
||||
'(-s --style)'{-s,--style}'[specify widget style]:style:(qt)' \
|
||||
'(-g --geometry --ncurses)'{-g,--geometry}'[specify default window size]:_x_geometry' \
|
||||
'--qt[use the QT graphical frontend]' \
|
||||
'--gtk[use the GTK graphical frontend]' \
|
||||
'--ncurses[use the curses text-mode frontend]' \
|
||||
'--noborder[no window manager border for main window]' \
|
||||
'--fullscreen[use full screen]' \
|
||||
'(-)'{-i,--install}'[install package]:*:package file:_files -g "*.rpm(-.)"' \
|
||||
'(-)--remove[remove package]:*:package' \
|
||||
'1:module:( ${${(f)"$($words[1] -l 2>/dev/null)"}[2,-1]##* } )'
|
||||
|
|
@ -1,30 +0,0 @@
|
|||
#compdef yast2 yast
|
||||
|
||||
local curcontext="$curcontext" state line
|
||||
typeset -A opt_args
|
||||
|
||||
if [[ -z "$_yast2_modules" ]]; then
|
||||
for i in $(/sbin/yast2 --list | grep -v "Available.*modules"); do
|
||||
_yast2_modules=($_yast2_modules $i)
|
||||
done
|
||||
fi
|
||||
|
||||
_arguments -s \
|
||||
'(--list)-l[list all available modules]' '(-l)--list' \
|
||||
'(--help)-h[help]' '(-h)--help'\
|
||||
\
|
||||
{'(--geometry)-g[default window size (qt only)]','(-g)--geometry'}':geometry:(800x600+0+0)' \
|
||||
'(--style)-s[widget style (qt only)]' '(-s)--style' \
|
||||
\
|
||||
{'(--install)-i[install rpm package]','(-i)--install'}':filename:_files' \
|
||||
\
|
||||
'--noborder[no window manager border for main window]' '--noborder' \
|
||||
'--fullscreen[use full screen]' '--fullscreen' \
|
||||
\
|
||||
':module:->module' && return 0
|
||||
|
||||
case $state in
|
||||
module) compadd $_yast2_modules; _files -g "*.ycp";;
|
||||
esac
|
||||
|
||||
|
||||
Loading…
Reference in a new issue