From dfb01cc47304f99523699544e01382be9f6e93cf Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Thu, 25 Aug 2016 19:30:54 +0300 Subject: [PATCH] fix wildcards in backup exclusion list --- bin/v-list-user-backup-exclusions | 3 ++- web/templates/admin/list_backup_exclusions.html | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/bin/v-list-user-backup-exclusions b/bin/v-list-user-backup-exclusions index d0f428e8..4ef75bf7 100755 --- a/bin/v-list-user-backup-exclusions +++ b/bin/v-list-user-backup-exclusions @@ -18,6 +18,7 @@ source $VESTA/func/main.sh # JSON list function json_list() { + set -f i=1 echo '{' echo ' "WEB": {' @@ -27,7 +28,7 @@ json_list() { object_keys=$(echo ${object//:/ } |wc -w) for key in $(echo "${object/:/ }"); do if [ "$j" -eq 1 ]; then - echo -n " \"$key\": " + echo -n " \"${key}\": " if [ "$object_keys" -eq 1 ]; then echo -n '""' fi diff --git a/web/templates/admin/list_backup_exclusions.html b/web/templates/admin/list_backup_exclusions.html index 28d07574..67de46a7 100644 --- a/web/templates/admin/list_backup_exclusions.html +++ b/web/templates/admin/list_backup_exclusions.html @@ -77,7 +77,7 @@ $ex_value) { - echo ''.$ex_key.':'.$ex_value.'
'; + echo ''.$ex_key.' '.$ex_value.'
'; } ?>