From c001d1f2a2eb7c3ddea1c1f09ca6660070befaa3 Mon Sep 17 00:00:00 2001 From: Matthew Martin Date: Wed, 7 Sep 2016 07:41:24 -0500 Subject: 39221: update rm completion for BSD --- Completion/Unix/Command/_rm | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) (limited to 'Completion/Unix/Command/_rm') diff --git a/Completion/Unix/Command/_rm b/Completion/Unix/Command/_rm index 4d0dbdb3f..4a5c9a178 100644 --- a/Completion/Unix/Command/_rm +++ b/Completion/Unix/Command/_rm @@ -22,16 +22,24 @@ if _pick_variant gnu=gnu unix --help; then '(- *)--version[output version information and exit]' ) else - args=(${args:#*--(force|recursive)\[*}) + args=(${args:#*)--*\[*}) case $OSTYPE in - freebsd*) + dragonfly*|freebsd*|netbsd*|openbsd*) args+=( '-d[remove directories as well]' - '(-i)-I[prompt when removing many files]' - '-P[overwrite files before deleting them]' - '-v[explain what is being done]' - '-W[attempt to undelete named files]' - "-x[don't cross file systems when removing a hierarchy]" + '-P[overwrite files before deleting them]' + ) + ;; + dragonfly*|freebsd*|netbsd*) + args+=( + '-v[explain what is being done]' + '-W[attempt to undelete named files]' + "-x[don't cross file systems when removing a hierarchy]" + ) + ;; + dragonfly*|freebsd*) + args+=( + '(-i)-I[prompt when removing many files]' ) ;; esac -- cgit v1.2.3 From 7d98ac7cd509ffc8221bb46323c040421347a3f3 Mon Sep 17 00:00:00 2001 From: Oliver Kiddle Date: Wed, 7 Sep 2016 23:33:42 +0200 Subject: unposted: fix to use ;| style fall-throughs in the case statement --- ChangeLog | 11 +++++++---- Completion/Unix/Command/_rm | 4 ++-- 2 files changed, 9 insertions(+), 6 deletions(-) (limited to 'Completion/Unix/Command/_rm') diff --git a/ChangeLog b/ChangeLog index 727ccadfb..36d1fb608 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,15 +1,18 @@ 2016-09-07 Oliver Kiddle - 39209: Matthew Martin: Completion/BSD/Command/_chflags: + * unposted: Completion/Unix/Command/_rm: fix to use ;| + style fall-throughs in the case statement + + * 39209: Matthew Martin: Completion/BSD/Command/_chflags: Update options - 39208: Matthew Martin: Completion/BSD/Command/_chflags: + * 39208: Matthew Martin: Completion/BSD/Command/_chflags: Update flags - 39223: Matthew Martin: Completion/BSD/Command/_chflags: + * 39223: Matthew Martin: Completion/BSD/Command/_chflags: Introduce addflags function to reduce redundancy - 39193: Completion/Unix/Type/_remote_files: don't pass options + * 39193: Completion/Unix/Type/_remote_files: don't pass options from after -- on to compadd 2016-09-07 Peter Stephenson diff --git a/Completion/Unix/Command/_rm b/Completion/Unix/Command/_rm index 4a5c9a178..6d728b157 100644 --- a/Completion/Unix/Command/_rm +++ b/Completion/Unix/Command/_rm @@ -29,14 +29,14 @@ else '-d[remove directories as well]' '-P[overwrite files before deleting them]' ) - ;; + ;| dragonfly*|freebsd*|netbsd*) args+=( '-v[explain what is being done]' '-W[attempt to undelete named files]' "-x[don't cross file systems when removing a hierarchy]" ) - ;; + ;| dragonfly*|freebsd*) args+=( '(-i)-I[prompt when removing many files]' -- cgit v1.2.3