Skip to content

Commit

Permalink
Use the configured tarsnap binary for copying
Browse files Browse the repository at this point in the history
Since ee92866 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.
  • Loading branch information
pascalj committed Aug 17, 2019
1 parent f1b5353 commit 15d4a4d
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions acts
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down

0 comments on commit 15d4a4d

Please sign in to comment.