diff options
| author | Andrey A. Chernov <ache@FreeBSD.org> | 2004-02-28 04:58:40 +0000 |
|---|---|---|
| committer | Andrey A. Chernov <ache@FreeBSD.org> | 2004-02-28 04:58:40 +0000 |
| commit | 6fec5a9e2a55997823c0e32d2b5d6b0a8e429512 (patch) | |
| tree | a5981f1f3f10b6fea18201f911226c190a6c20a7 /etc | |
| parent | 6b3573d8f03d2497500c597cc23b6f5e3e50a25f (diff) | |
| download | src-6fec5a9e2a55997823c0e32d2b5d6b0a8e429512.tar.gz src-6fec5a9e2a55997823c0e32d2b5d6b0a8e429512.zip | |
Don't remove empty dirs if their names are in $daily_clean_tmps_ignore
Notes
Notes:
svn path=/head/; revision=126342
Diffstat (limited to 'etc')
| -rwxr-xr-x | etc/periodic/daily/110.clean-tmps | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/etc/periodic/daily/110.clean-tmps b/etc/periodic/daily/110.clean-tmps index 0d2e96ad79ab..eef3bc6545b5 100755 --- a/etc/periodic/daily/110.clean-tmps +++ b/etc/periodic/daily/110.clean-tmps @@ -28,9 +28,13 @@ case "$daily_clean_tmps_enable" in set -f noglob args="-atime +$daily_clean_tmps_days -mtime +$daily_clean_tmps_days" args="${args} -ctime +$daily_clean_tmps_days" - [ -n "$daily_clean_tmps_ignore" ] && + dargs="-empty -mtime +$daily_clean_tmps_days" + [ -n "$daily_clean_tmps_ignore" ] && { args="$args "`echo " ${daily_clean_tmps_ignore% }" | sed 's/[ ][ ]*/ ! -name /g'` + dargs="$dargs "`echo " ${daily_clean_tmps_ignore% }" | + sed 's/[ ][ ]*/ ! -name /g'` + } case "$daily_clean_tmps_verbose" in [Yy][Ee][Ss]) print=-print;; @@ -42,8 +46,7 @@ case "$daily_clean_tmps_enable" in do [ ."${dir#/}" != ."$dir" -a -d $dir ] && cd $dir && { find -d . -type f $args -delete $print - find -d . ! -name . -type d -empty -mtime \ - +$daily_clean_tmps_days -delete $print + find -d . ! -name . -type d $dargs -delete $print } | sed "s,^\\., $dir," done | tee /dev/stderr | wc -l) [ -z "$print" ] && rc=0 |