From a5712542d7315f45abf6df275744889437393c30 Mon Sep 17 00:00:00 2001 From: dpeca Date: Mon, 23 Mar 2020 01:21:57 +0100 Subject: [PATCH] Temporary fix for parsing backup conf --- bin/v-backup-user | 3 ++- bin/v-list-user-backups | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/bin/v-backup-user b/bin/v-backup-user index f9fcf6f53..646e9812c 100755 --- a/bin/v-backup-user +++ b/bin/v-backup-user @@ -479,7 +479,8 @@ if [ "$USER" != '*' ]; then exclusion=$(echo "$USER" |tr ',' '\n' |grep "^$udir$") if [ -z "$exclusion" ]; then ((i ++)) - udir_list="$udir_list $udir" + udir_str=$(echo "$udir" |sed -e "s|'|\\\'|g") + udir_list="$udir_list $udir_str" echo -e "$(date "+%F %T") adding $udir" |tee -a $BACKUP/$user.log # Backup files and dirs diff --git a/bin/v-list-user-backups b/bin/v-list-user-backups index 813ee6871..7e7e284e3 100755 --- a/bin/v-list-user-backups +++ b/bin/v-list-user-backups @@ -22,7 +22,7 @@ json_list() { i=1 objects=$(grep BACKUP $USER_DATA/backup.conf |wc -l) echo "{" - while read str; do + while read -r str; do eval $str echo -n ' "'$BACKUP'": { "TYPE": "'$TYPE'",