From 34277483e9571506cc35469a9606664ad85d1ebc Mon Sep 17 00:00:00 2001 From: Clemens Schwaighofer Date: Mon, 18 Apr 2022 16:00:41 +0900 Subject: [PATCH] Borg check -p (progress) is only set if -v (verbose) flag is set Avoid any progress output if run from script --- borg.backup.functions.verify.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/borg.backup.functions.verify.sh b/borg.backup.functions.verify.sh index 4e1080b..3101f9a 100644 --- a/borg.backup.functions.verify.sh +++ b/borg.backup.functions.verify.sh @@ -350,22 +350,22 @@ if [ ${CHECK} -eq 1 ]; then fi; # debug/dryrun if [ ${DEBUG} -eq 1 ] || [ ${DRYRUN} -eq 1 ]; then - echo "export BORG_BASE_DIR=\"${BASE_FOLDER}\";${BORG_COMMAND} check -p ${OPT_CHECK_VERIFY_DATA} ${OPT_GLOB} ${REPOSITORY}"; + echo "export BORG_BASE_DIR=\"${BASE_FOLDER}\";${BORG_COMMAND} check ${OPT_PROGRESS} ${OPT_CHECK_VERIFY_DATA} ${OPT_GLOB} ${REPOSITORY}"; fi; # run info command if not a dry drun if [ ${DRYRUN} -eq 0 ]; then # if glob add glob command directly if [[ "${CHECK_PREFIX}" =~ $REGEX_GLOB ]]; then - ${BORG_COMMAND} check -p ${OPT_CHECK_VERIFY_DATA} -a "${CHECK_PREFIX}" ${REPOSITORY}; + ${BORG_COMMAND} check ${OPT_PROGRESS} ${OPT_CHECK_VERIFY_DATA} -a "${CHECK_PREFIX}" ${REPOSITORY}; else - ${BORG_COMMAND} check -p ${OPT_CHECK_VERIFY_DATA} ${OPT_GLOB} ${REPOSITORY}; + ${BORG_COMMAND} check ${OPT_PROGRESS} ${OPT_CHECK_VERIFY_DATA} ${OPT_GLOB} ${REPOSITORY}; fi; fi; # print additional info for use --repair command if [ ${VERBOSE} -eq 1 ]; then echo ""; - echo "In case of repair: " - echo "export BORG_BASE_DIR=\"${BASE_FOLDER}\";${BORG_COMMAND} check -p --repair ${OPT_GLOB} ${REPOSITORY}"; + echo "In case of needed repair: " + echo "export BORG_BASE_DIR=\"${BASE_FOLDER}\";${BORG_COMMAND} check ${OPT_PROGRESS} --repair ${OPT_GLOB} ${REPOSITORY}"; echo "Before running repair, a copy from the backup should be made because repair might damage a backup" fi; . "${DIR}/borg.backup.functions.close.sh";