[Pkg-sysvinit-commits] r556 -
sysvinit/trunk/debian/initscripts/etc/init.d
Thomas Hood
jdthood-guest at costa.debian.org
Mon Jan 9 15:22:20 UTC 2006
Author: jdthood-guest
Date: 2006-01-09 15:22:20 +0000 (Mon, 09 Jan 2006)
New Revision: 556
Modified:
sysvinit/trunk/debian/initscripts/etc/init.d/bootclean.sh
Log:
Fix indentation as a result of subshell removal
Modified: sysvinit/trunk/debian/initscripts/etc/init.d/bootclean.sh
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/bootclean.sh 2006-01-09 15:16:23 UTC (rev 555)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/bootclean.sh 2006-01-09 15:22:20 UTC (rev 556)
@@ -60,17 +60,17 @@
! ( -path './...security*' -uid 0 )'
CLEANTMP_SAVE_PWD="$PWD"
- if cd /tmp && [ "$(find . -maxdepth 0 -perm -002)" = "." ]
- then
- # First remove all old files...
- # (Use xargs here so that only one additional process gets created)
- find . -depth -xdev $TEXPR $EXCEPT ! -type d \
- -print0 | xargs -0r rm -f --
- # ...and then all empty directories
- find . -depth -xdev $DEXPR $EXCEPT -type d -empty \
- -print0 | xargs -0r rmdir --ignore-fail-on-non-empty --
- rm -f .X*-lock
- fi
+ if cd /tmp && [ "$(find . -maxdepth 0 -perm -002)" = "." ]
+ then
+ # First remove all old files...
+ # (Use xargs here so that only one additional process gets created)
+ find . -depth -xdev $TEXPR $EXCEPT ! -type d \
+ -print0 | xargs -0r rm -f --
+ # ...and then all empty directories
+ find . -depth -xdev $DEXPR $EXCEPT -type d -empty \
+ -print0 | xargs -0r rmdir --ignore-fail-on-non-empty --
+ rm -f .X*-lock
+ fi
cd "$CLEANTMP_SAVE_PWD"
[ "$VERBOSE" != no ] && log_action_end_msg 0
}
@@ -82,9 +82,8 @@
[ -f /var/lock/.clean ] && return
[ "$VERBOSE" != no ] && log_action_begin_msg "Cleaning /var/lock"
CLEANLOCK_SAVE_PWD="$PWD"
- cd /var/lock \
- && find . ! -type d \
- -print0 | xargs -0r rm -f --
+ cd /var/lock && find . ! -type d \
+ -print0 | xargs -0r rm -f --
cd "$CLEANLOCK_SAVE_PWD"
rm -f /var/lock/.clean
set -o noclobber
@@ -100,9 +99,8 @@
[ -f /var/run/.clean ] && return
[ "$VERBOSE" != no ] && log_action_begin_msg "Cleaning /var/run"
CLEANRUN_SAVE_PWD="$PWD"
- cd /var/run \
- && find . ! -xtype d ! -name utmp ! -name innd.pid \
- -print0 | xargs -0r rm -f --
+ cd /var/run && find . ! -xtype d ! -name utmp ! -name innd.pid \
+ -print0 | xargs -0r rm -f --
cd "$CLEANRUN_SAVE_PWD"
rm -f /var/run/.clean
set -o noclobber
More information about the Pkg-sysvinit-commits
mailing list