diff --git a/lib/bkctld-stats b/lib/bkctld-stats index 0f7d261..896b195 100755 --- a/lib/bkctld-stats +++ b/lib/bkctld-stats @@ -22,6 +22,12 @@ trap "rm ${duc_output} ${incs_output} ${stat_output}" 0 "${DUC}" ls -d "${IDX_FILE}" "${JAILDIR}" > "${duc_output}" awk '{ print $2 }' "${duc_output}" | while read jail; do stat --format=%Y "/backup/jails/${jail}/var/log/lastlog" | xargs -i -n1 date -d "@{}" "+%d-%m-%Y" >> "${stat_output}" - get_inc "${jail}" >> "${incs_output}" + inc=0 + if [ -f "${CONFDIR}/${jail}" ]; then + day=$(grep -c "day" "${CONFDIR}/${jail}") + month=$(grep -c "month" "${CONFDIR}/${jail}") + inc="${day}/${month}" + fi + echo "${inc}" >> "${incs_output}" done paste "${duc_output}" "${incs_output}" "${stat_output}" | awk '{ printf("%- 30s %- 10s %- 10s %- 15s\n", $2, $1, $3, $4); }' diff --git a/lib/bkctld-status b/lib/bkctld-status index aaa2c7a..fa057ac 100755 --- a/lib/bkctld-status +++ b/lib/bkctld-status @@ -12,7 +12,12 @@ if [ ! -n "${jail}" ]; then fi check_jail "${jail}" || error "${jail} : inexistant jail ! Use '$0 status' for list all" -inc=$(get_inc "${jail}") +inc="0" +if [ -f "${CONFDIR}/${jail}" ]; then + day=$(grep -c "day" "${CONFDIR}/${jail}") + month=$(grep -c "month" "${CONFDIR}/${jail}") + inc="${day}/${month}" +fi if ( check_jail_on "${jail}" ); then status="ON " else diff --git a/lib/functions b/lib/functions index b1584d5..5fb1461 100755 --- a/lib/functions +++ b/lib/functions @@ -20,14 +20,3 @@ check_jail_on() { fi return "${return}" } - -get_inc() { - jail="${1}" - inc="0" - if [ -f "${CONFDIR}/${jail}" ]; then - day=$(grep -c "day" "${CONFDIR}/${jail}") - month=$(grep -c "month" "${CONFDIR}/${jail}") - inc="${day}/${month}" - fi - echo "${inc}" -}