From f8c24cb457ed49f93d7fb5fa397be32e92929de3 Mon Sep 17 00:00:00 2001 From: Janek Bevendorff Date: Sun, 5 Oct 2014 19:38:21 +0200 Subject: [PATCH] Improve script compatibility by replacing PCRE grep with awk (resulting in overall nicer code) --- server/usr/sbin/rs-rotate-cron | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/server/usr/sbin/rs-rotate-cron b/server/usr/sbin/rs-rotate-cron index b46835d..9908c40 100755 --- a/server/usr/sbin/rs-rotate-cron +++ b/server/usr/sbin/rs-rotate-cron @@ -43,15 +43,14 @@ for home_dir in "${BACKUP_ROOT}"/*; do config=$(cat "${BACKUP_ROOT}/etc/rsnapshot.global.conf") # Get number of preceding increments - config=$(echo "${config}" | grep -P '^retain\t') - config=$(echo "${config}" | grep -oPz "retain\t+(\w+)\t+(\d+)\nretain\s+${1}\t+" | sed -n 1p) + config=$(echo "${config}" | awk '$1 == "retain" && $2 == "'${1}'" { print lastline } { lastline = $0 }') preceding_name=$(echo "${config}" | awk '{ print $2 }') preceding_number=$(($(echo "${config}" | awk ' { print $3 }') - 1)) # Continue if no proper preceding increment could be found if [ "${preceding_name}" == "" ] || [ ! -d "${home_dir}/${FILES_DIR}/${preceding_name}.${preceding_number}" ]; then - echo "Not rotating ${1}" + echo "Not enough preceding increments found, not rotating ${1}" continue fi