From 15d4a4d2472573df298b0cd55def7e589f3f723a Mon Sep 17 00:00:00 2001 From: Pascal Jungblut Date: Sat, 17 Aug 2019 13:15:47 +0200 Subject: [PATCH] Use the configured tarsnap binary for copying Since ee92866b7c copying yearly/monthly archives uses `tarsnap` instead of `$tarsnap`. That breaks acts if $tarsnap is not in PATH or additional parameters like `--keyfile` are provided. Using in `$tarsnap` fixes the problem. --- acts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/acts b/acts index ae58a09..c6d60ca 100755 --- a/acts +++ b/acts @@ -197,7 +197,7 @@ for dir in $backuptargets; do log_debug "message=\"Copying daily archive to yearly archive\"" archive_starttime=$(date +%s) # shellcheck disable=SC2086 - if ! output="$(tarsnap -c -f "$yearlyarchive" $tarsnapbackupoptions "@@$dailyarchive" 2>&1)"; then + if ! output="$($tarsnap -c -f "$yearlyarchive" $tarsnapbackupoptions "@@$dailyarchive" 2>&1)"; then log_message "copy-error type=yearly output=\"$(echo $output | tr '\n' " ")\"" backuprc=1 fi @@ -210,7 +210,7 @@ for dir in $backuptargets; do log_debug "message=\"Copying daily archive to monthly archive\"" archive_starttime=$(date +%s) # shellcheck disable=SC2086 - if ! output="$(tarsnap -c -f "$monthlyarchive" $tarsnapbackupoptions "@@$dailyarchive" 2>&1)"; then + if ! output="$($tarsnap -c -f "$monthlyarchive" $tarsnapbackupoptions "@@$dailyarchive" 2>&1)"; then log_message "copy-error type=monthly output=\"$(echo $output | tr '\n' " ")\"" backuprc=1 fi