From: Thierry Parmentelat Date: Wed, 18 May 2011 06:57:26 +0000 (+0200) Subject: made silent X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=a61f3f7e93ace7a1e89488bb40c64b70fb2c684a;p=infrastructure.git made silent --- diff --git a/scripts/nightly-clean-trash.sh b/scripts/nightly-clean-trash.sh index c5cdeba..11b2078 100755 --- a/scripts/nightly-clean-trash.sh +++ b/scripts/nightly-clean-trash.sh @@ -6,10 +6,10 @@ [[ -n "$@" ]] && [ "$1" = "-n" ] && set -x todelete=$(find /build/trash -maxdepth 1 -mtime +1 -print | grep -v 'trash/*$') -potential_vservers=$(find /build/trash -maxdepth 1 -type d -print | grep -v 'trash/*$') +potential_vservers=$(find /build/trash -maxdepth 1 -type d -print 2> /dev/null | grep -v 'trash/*$') # clean the vservers first -for vserver in $potential_vservers ; do +[ -d /vservers ] && for vserver in $potential_vservers ; do vname=$(basename $vserver) vname=$(basename $vname .log.txt) if [ -d /vservers/$vname ] ; then @@ -20,7 +20,7 @@ done &> /dev/null echo $todelete | xargs rm -rf -daily_vnames=$(find /vservers/ -maxdepth 1 -type d -name '20*' -mtime +7 -print | sed -e 's,^/vservers/,,') +daily_vnames=$(find /vservers/ -maxdepth 1 -type d -name '20*' -mtime +7 -print 2> /dev/null | sed -e 's,^/vservers/,,') for vname in $daily_vnames; do [ -f /vservers/${vname}.log.txt ] && rm /vservers/${vname}.log.txt [ -d /vservers/$vname ] && vserver --silent $vname delete