From 093de8b0a16048b753191790591574df70608602 Mon Sep 17 00:00:00 2001
From: Nico Schottelius <nico@kr.ethz.ch>
Date: Sat, 15 Jan 2011 02:09:27 +0100
Subject: [PATCH] simplify backup count code

Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
---
 ccollect | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/ccollect b/ccollect
index 8673128..01ef9b1 100755
--- a/ccollect
+++ b/ccollect
@@ -440,7 +440,7 @@ while [ "${source_no}" -lt "${no_sources}" ]; do
    #
    # Check incomplete backups (needs echo to remove newlines)
    #
-   pcmd ls -d1 "${ddir}" | grep "${CMARKER}\$" > "${TMP}" || \
+   ls -1 | grep "${CMARKER}\$" > "${TMP}" || \
       _exit_err "Cannot list incomplete files"
 
    _techo "Incomplete backups: $(echo $(cat "${TMP}"))"
@@ -451,8 +451,7 @@ while [ "${source_no}" -lt "${no_sources}" ]; do
    #
    # Check: maximum number of backups is reached?
    #
-   # FIXME: simplify, grep, cd? => no star, does not get expanded on failure
-   count="$(pcmd ls -d1 "${ddir}/${INTERVAL}."*"/" | wc -l | sed 's/^ *//g')" \
+   count="$(ls -1 | grep "^${INTERVAL}\\." | wc -l | sed 's/^ *//g')" \
       || _exit_err "Counting backups failed"
 
    _techo "Existing backups: ${count} Total keeping backups: ${c_interval}"