aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorknu <knu@FreeBSD.org>2001-05-18 22:20:15 +0800
committerknu <knu@FreeBSD.org>2001-05-18 22:20:15 +0800
commitaf7799dce9736dfa74815a1bf9845ef66eaf5259 (patch)
treed0a35e5a85b0fdcddc3ce90169d7e259d24ca018
parent0a09dd8f5073a11ef52987dbdfe7b04e8c6c4617 (diff)
downloadfreebsd-ports-gnome-af7799dce9736dfa74815a1bf9845ef66eaf5259.tar.gz
freebsd-ports-gnome-af7799dce9736dfa74815a1bf9845ef66eaf5259.tar.zst
freebsd-ports-gnome-af7799dce9736dfa74815a1bf9845ef66eaf5259.zip
Fix a rmdir line so it never fails.
Submitted by: Jimmy Olgeni <olgeni@FreeBSD.org>
-rw-r--r--ports-mgmt/portupgrade-devel/pkg-plist3
-rw-r--r--ports-mgmt/portupgrade/pkg-plist3
-rw-r--r--sysutils/portupgrade-devel/pkg-plist3
-rw-r--r--sysutils/portupgrade/pkg-plist3
4 files changed, 8 insertions, 4 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
diff --git a/sysutils/portupgrade-devel/pkg-plist b/sysutils/portupgrade-devel/pkg-plist
index 3be08857fb2d..86341cee5875 100644
--- a/sysutils/portupgrade-devel/pkg-plist
+++ b/sysutils/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/sysutils/portupgrade/pkg-plist b/sysutils/portupgrade/pkg-plist
index 3be08857fb2d..86341cee5875 100644
--- a/sysutils/portupgrade/pkg-plist
+++ b/sysutils/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