Merge remote-tracking branch 'origin/dev' into rework-logging
This commit is contained in:
commit
fb54765c53
1 changed files with 7 additions and 0 deletions
|
|
@ -483,6 +483,8 @@ email_logfile()
|
||||||
mailcmd_bsd_mailx;;
|
mailcmd_bsd_mailx;;
|
||||||
heirloom-mailx)
|
heirloom-mailx)
|
||||||
mailcmd_heirloom_mailx;;
|
mailcmd_heirloom_mailx;;
|
||||||
|
s-nail)
|
||||||
|
mailcmd_nail;;
|
||||||
*)
|
*)
|
||||||
mailcmd_else;;
|
mailcmd_else;;
|
||||||
esac
|
esac
|
||||||
|
|
@ -542,6 +544,8 @@ get_source_file_size()
|
||||||
{
|
{
|
||||||
echo "-----------[ Source Disk Use Information ]-----------"
|
echo "-----------[ Source Disk Use Information ]-----------"
|
||||||
|
|
||||||
|
# FIXME: doesn't work properly with include/exclude-filelists (issue #101)
|
||||||
|
|
||||||
# Patches to support spaces in paths-
|
# Patches to support spaces in paths-
|
||||||
# Remove space as a field separator temporarily
|
# Remove space as a field separator temporarily
|
||||||
OLDIFS=$IFS
|
OLDIFS=$IFS
|
||||||
|
|
@ -560,6 +564,9 @@ get_source_file_size()
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
|
# always exclude /proc
|
||||||
|
DUEXCLIST="/proc\n"
|
||||||
|
|
||||||
for exclude in "${EXCLIST[@]}"; do
|
for exclude in "${EXCLIST[@]}"; do
|
||||||
DUEXCLIST="${DUEXCLIST}${exclude}\n"
|
DUEXCLIST="${DUEXCLIST}${exclude}\n"
|
||||||
done
|
done
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue