Rewrite @exec's so final condition always be true on success

Submitted by:	Jimmy Olgeni <olgeni@uli.it>
This commit is contained in:
Andrey A. Chernov 2001-08-25 20:53:02 +00:00
parent 29bde1b218
commit 944ee29d98
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=46903

View file

@ -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