aboutsummaryrefslogtreecommitdiff
path: root/ports-mgmt
diff options
context:
space:
mode:
authorAkinori MUSHA <knu@FreeBSD.org>2001-05-18 14:20:15 +0000
committerAkinori MUSHA <knu@FreeBSD.org>2001-05-18 14:20:15 +0000
commit1e3888f0dcd26853e05a7db27834b51adcf956f9 (patch)
treed2acc5c9eec54181fd7ca499597415397dad9e0f /ports-mgmt
parent33e0ea87da29c6bfecbff25d7bd8b2b455b1d3c3 (diff)
downloadports-1e3888f0dcd26853e05a7db27834b51adcf956f9.tar.gz
ports-1e3888f0dcd26853e05a7db27834b51adcf956f9.zip
Fix a rmdir line so it never fails.
Submitted by: Jimmy Olgeni <olgeni@FreeBSD.org>
Notes
Notes: svn path=/head/; revision=42703
Diffstat (limited to 'ports-mgmt')
-rw-r--r--ports-mgmt/portupgrade-devel/pkg-plist3
-rw-r--r--ports-mgmt/portupgrade/pkg-plist3
2 files changed, 4 insertions, 2 deletions
diff --git a/ports-mgmt/portupgrade-devel/pkg-plist b/ports-mgmt/portupgrade-devel/pkg-plist
index 3be08857fb2d..86341cee5875 100644
--- a/ports-mgmt/portupgrade-devel/pkg-plist
+++ b/ports-mgmt/portupgrade-devel/pkg-plist
@@ -9,6 +9,7 @@ sbin/portversion
%%RUBY_SITELIBDIR%%/portsdb.rb
share/zsh/site-functions/_portupgrade
share/zsh/site-functions/_portversion
-@unexec if [ ! -x %D/bin/zsh ]; then rmdir -p %D/share/zsh/site-functions; fi
+@unexec rmdir %D/share/zsh/site-functions 2>/dev/null || true
+@unexec rmdir %D/share/zsh 2>/dev/null || true
%%PORTDOCS%%share/doc/portupgrade/README
%%PORTDOCS%%@dirrm share/doc/portupgrade
diff --git a/ports-mgmt/portupgrade/pkg-plist b/ports-mgmt/portupgrade/pkg-plist
index 3be08857fb2d..86341cee5875 100644
--- a/ports-mgmt/portupgrade/pkg-plist
+++ b/ports-mgmt/portupgrade/pkg-plist
@@ -9,6 +9,7 @@ sbin/portversion
%%RUBY_SITELIBDIR%%/portsdb.rb
share/zsh/site-functions/_portupgrade
share/zsh/site-functions/_portversion
-@unexec if [ ! -x %D/bin/zsh ]; then rmdir -p %D/share/zsh/site-functions; fi
+@unexec rmdir %D/share/zsh/site-functions 2>/dev/null || true
+@unexec rmdir %D/share/zsh 2>/dev/null || true
%%PORTDOCS%%share/doc/portupgrade/README
%%PORTDOCS%%@dirrm share/doc/portupgrade