From f5d2150e9db9205a9f208d4144b6d0381f877ad3 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Wed, 21 Nov 2007 11:25:50 -0600 Subject: Remove -F/--freshen operation This operation made sense in the days before sync DBs existed, but it no longer has the same usefulness it once did. Signed-off-by: Dan McGee Signed-off-by: Chantry Xavier Signed-off-by: Nagy Gabor Signed-off-by: Aaron Griffin --- contrib/bash_completion | 6 ++---- contrib/zsh_completion | 11 +---------- 2 files changed, 3 insertions(+), 14 deletions(-) (limited to 'contrib') diff --git a/contrib/bash_completion b/contrib/bash_completion index 6aafc9ec..844396d3 100644 --- a/contrib/bash_completion +++ b/contrib/bash_completion @@ -146,7 +146,7 @@ _pacman () toparse="${a:2}" case "${arg}" in - -@(A|U|F|R|S|Q|h|V)) + -@(A|U|R|S|Q|h|V)) op="${arg/-}" mod="${mod}${a:2}" ;; @@ -156,7 +156,6 @@ _pacman () add) op="A" ;; remove) op="R" ;; upgrade) op="U" ;; - freshen) op="F" ;; query) op="Q" ;; sync) op="S" ;; help) op="h" ;; @@ -204,7 +203,6 @@ _pacman () if [ $COMP_CWORD -eq 1 ] && [[ "$cur" == -* ]]; then COMPREPLY=( $( compgen -W '\ -A --add \ - -F --freshen \ -h --help \ -Q --query \ -R --remove \ @@ -218,7 +216,7 @@ _pacman () if [[ "$cur" == -* ]]; then case "${op}" in - A|U|F) + A|U) COMPREPLY=( $( compgen -W '\ --asdeps \ -d --nodeps \ diff --git a/contrib/zsh_completion b/contrib/zsh_completion index 4607bd7e..566c39f2 100644 --- a/contrib/zsh_completion +++ b/contrib/zsh_completion @@ -7,7 +7,6 @@ typeset -A opt_args # options for passing to _arguments: main pacman commands _pacman_opts_commands=( '-A[Add a package to the system]' - '-F[Upgrade an installed package]' '-Q[Query the package database]' '-R[Remove a package from the system]' '-S[Synchronize packages]' @@ -26,7 +25,7 @@ _pacman_opts_common=( '--noconfirm[Do not ask for confirmation]' ) -# options for passing to _arguments: options for --add, --freshen and --update commands +# options for passing to _arguments: options for --add, and --update commands _pacman_opts_pkgfile=( '-d[Skip dependency checks]' '-f[Overwrite conflicting files]' @@ -85,13 +84,6 @@ _pacman_action_add() { "$_pacman_opts_pkgfile[@]" } -# handles --freshen subcommand -_pacman_action_freshen() { - _arguments -s : \ - "$_pacman_opts_common[@]" \ - "$_pacman_opts_pkgfile[@]" -} - # handles --help subcommand _pacman_action_help() { _arguments -s : \ @@ -274,7 +266,6 @@ _pacman_get_command() { _pacman() { case $words[2] in -A*) _pacman_action_add ;; - -F*) _pacman_action_freshen ;; -Qg) # ipkg groups _arguments -s : \ "$_pacman_opts_common[@]" \ -- cgit v1.2.3-24-g4f1b