diff options
| author | Dan McGee <dan@archlinux.org> | 2011-10-11 19:35:33 +0200 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2011-10-14 15:13:38 +0200 |
| commit | 0d2600c575033774485f84ad67cbc602592237ab (patch) | |
| tree | 55e813faed36b47a2ef7757d2eb5a81ee6275f31 /contrib | |
| parent | 8605284e0d1b70d9845ca4c6362d7d451f503d32 (diff) | |
| download | pacman-0d2600c575033774485f84ad67cbc602592237ab.tar.gz pacman-0d2600c575033774485f84ad67cbc602592237ab.tar.xz | |
Remove -f short option for --force
This is not something that should be used on a frequent basis, and
giving it a short option encourages use without making the drawbacks
obvious. For the 1% of situations that require it, the 5 extra
keystrokes are a fair price to pay.
Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/bash_completion.in | 4 | ||||
| -rw-r--r-- | contrib/zsh_completion.in | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/contrib/bash_completion.in b/contrib/bash_completion.in index 78bde21d..eb31b5e5 100644 --- a/contrib/bash_completion.in +++ b/contrib/bash_completion.in @@ -76,8 +76,8 @@ _pacman() { remove=('cascade dbonly nodeps nosave print recursive unneeded' 'c n p s u') sync=('asdeps asexplicit clean dbonly downloadonly force groups ignore ignoregroup info list needed nodeps print refresh recursive search sysupgrade' - 'c f g i l p s u w y') - upgrade=('asdeps asexplicit force needed nodeps print recursive' 'f p') + 'c g i l p s u w y') + upgrade=('asdeps asexplicit force needed nodeps print recursive' 'p') common=('arch cachedir config dbpath debug help logfile noconfirm noprogressbar noscriptlet quiet root verbose' 'b d h q r v') core=('database help query remove sync upgrade version' 'D Q R S U V h') diff --git a/contrib/zsh_completion.in b/contrib/zsh_completion.in index f7e0b923..71ef901b 100644 --- a/contrib/zsh_completion.in +++ b/contrib/zsh_completion.in @@ -32,8 +32,8 @@ _pacman_opts_common=( # options for passing to _arguments: options for --upgrade commands _pacman_opts_pkgfile=( '-d[Skip dependency checks]' - '-f[Overwrite conflicting files]' '--dbonly[Only remove database entry, do not remove files]' + '--force[Overwrite conflicting files]' '--needed[Do not reinstall up to date packages]' '--recursive[Reinstall all dependencies of target packages]' '*:package file:_files -g "*.pkg.tar.*(.)"' @@ -85,7 +85,6 @@ _pacman_opts_sync_actions=( # options for passing to _arguments: options for --sync command _pacman_opts_sync_modifiers=( '-d[Skip dependency checks]' - '-f[Overwrite conflicting files]' '-i[View package information]' '-l[List all packages in a repository]' '-p[Print download URIs for each package to be installed]' @@ -98,6 +97,7 @@ _pacman_opts_sync_modifiers=( _pacman_completions_all_groups' '--asdeps[Install packages as non-explicitly installed]' '--asexplicit[Install packages as explicitly installed]' + '--force[Overwrite conflicting files]' ) # handles --help subcommand |