FreeBSD-specific: * sed -r is sed -E * stat format parameters are different Move modules config to their own files. --- src/backupninja.in.orig Fri Oct 12 13:42:46 2007 +++ src/backupninja.in Wed Dec 5 00:26:19 2007 @@ -135,14 +135,14 @@ local perms local owners - perms=($(stat -L --format='%A' $file)) + perms=($(stat -L -f '%Sp' $file)) debug "perms: $perms" local gperm=${perms:4:3} debug "gperm: $gperm" local wperm=${perms:7:3} debug "wperm: $wperm" - owners=($(stat -L --format='%g %G %u %U' $file)) + owners=($(stat -L -f '%g %Sg %u %Su' $file)) local gid=${owners[0]} local group=${owners[1]} local owner=${owners[2]} @@ -204,7 +204,7 @@ whendayofweek=$1; at=$2; whentime=$3; whenday=`toint "$whendayofweek"` whendayofweek=`tolower "$whendayofweek"` - whentime=`echo "$whentime" | @SED@ 's/:[0-9][0-9]$//' | @SED@ -r 's/^([0-9])$/0\1/'` + whentime=`echo "$whentime" | @SED@ 's/:[0-9][0-9]$//' | @SED@ -E 's/^([0-9])$/0\1/'` if [ "$whendayofweek" == "everyday" -o "$whendayofweek" == "daily" ]; then whendayofweek=$nowdayofweek @@ -445,17 +445,6 @@ defaultwhen=$when getconf logfile @localstatedir@/log/backupninja.log getconf usecolors "yes" -getconf SLAPCAT /usr/sbin/slapcat -getconf LDAPSEARCH /usr/bin/ldapsearch -getconf RDIFFBACKUP /usr/bin/rdiff-backup -getconf CSTREAM=/usr/bin/cstream -getconf MYSQLADMIN /usr/bin/mysqladmin -getconf MYSQL /usr/bin/mysql -getconf MYSQLHOTCOPY /usr/bin/mysqlhotcopy -getconf MYSQLDUMP /usr/bin/mysqldump -getconf PGSQLDUMP /usr/bin/pg_dump -getconf PGSQLDUMPALL /usr/bin/pg_dumpall -getconf PGSQLUSER postgres getconf GZIP /bin/gzip getconf RSYNC /usr/bin/rsync getconf admingroup root