diff options
| author | Andrey A. Chernov <ache@FreeBSD.org> | 2001-08-25 20:53:02 +0000 |
|---|---|---|
| committer | Andrey A. Chernov <ache@FreeBSD.org> | 2001-08-25 20:53:02 +0000 |
| commit | 944ee29d9830c1c0a8d2cca2a34ef9c5d6dfda7e (patch) | |
| tree | f84f9988775469dfda5d1a60b92d2624cb1c721a /www/apache13 | |
| parent | Add MASTER_SITE_LOCAL to MASTER_SITES, since the site refuses to let (diff) | |
Rewrite @exec's so final condition always be true on success
Submitted by: Jimmy Olgeni <olgeni@uli.it>
Notes
Notes:
svn path=/head/; revision=46903
Diffstat (limited to 'www/apache13')
| -rw-r--r-- | www/apache13/pkg-plist | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/www/apache13/pkg-plist b/www/apache13/pkg-plist index f362be309613..0ff3407e0b0d 100644 --- a/www/apache13/pkg-plist +++ b/www/apache13/pkg-plist @@ -3,19 +3,19 @@ bin/htdigest bin/htpasswd @unexec if cmp -s %D/etc/apache/access.conf %D/etc/apache/access.conf.default; then rm -f %D/etc/apache/access.conf; fi etc/apache/access.conf.default -@exec [ ! -f %B/access.conf ] && cp %B/%f %B/access.conf +@exec [ -f %B/access.conf ] || cp %B/%f %B/access.conf @unexec if cmp -s %D/etc/apache/httpd.conf %D/etc/apache/httpd.conf.default; then rm -f %D/etc/apache/httpd.conf; fi etc/apache/httpd.conf.default -@exec [ ! -f %B/httpd.conf ] && cp %B/%f %B/httpd.conf +@exec [ -f %B/httpd.conf ] || cp %B/%f %B/httpd.conf @unexec if cmp -s %D/etc/apache/magic %D/etc/apache/magic.default; then rm -f %D/etc/apache/magic; fi etc/apache/magic.default -@exec [ ! -f %B/magic ] && cp %B/%f %B/magic +@exec [ -f %B/magic ] || cp %B/%f %B/magic @unexec if cmp -s %D/etc/apache/mime.types %D/etc/apache/mime.types.default; then rm -f %D/etc/apache/mime.types; fi etc/apache/mime.types.default -@exec [ ! -f %B/mime.types ] && cp %B/%f %B/mime.types +@exec [ -f %B/mime.types ] || cp %B/%f %B/mime.types @unexec if cmp -s %D/etc/apache/srm.conf %D/etc/apache/srm.conf.default; then rm -f %D/etc/apache/srm.conf; fi etc/apache/srm.conf.default -@exec [ ! -f %B/srm.conf ] && cp %B/%f %B/srm.conf +@exec [ -f %B/srm.conf ] || cp %B/%f %B/srm.conf etc/rc.d/apache.sh include/apache/ap.h include/apache/ap_alloc.h @@ -105,8 +105,8 @@ share/doc/apache/README.rus @exec mkdir -p %D/www @exec ln -fs %B %D/www/data.default @unexec rm -f %D/www/data.default -@exec [ ! -d %D/www/data ] && ln -fs %B %D/www/data -@exec [ ! -d %D/www/cgi-bin ] && ln -fs %D/www/cgi-bin.default %D/www/cgi-bin +@exec [ -d %D/www/data ] || ln -fs %B %D/www/data +@exec [ -d %D/www/cgi-bin ] || ln -fs %D/www/cgi-bin.default %D/www/cgi-bin share/doc/apache/apache_pb.gif share/doc/apache/index.html.ca share/doc/apache/index.html.cz |