github/myvesta
1
0
Fork 0
mirror of https://github.com/myvesta/vesta synced 2025-07-30 11:39:44 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Temporary fix for parsing backup conf

Browse source
This commit is contained in:
dpeca 2020-03-23 01:21:57 +01:00
parent 931fb5beeb
commit a5712542d7
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
bin/v-backup-user
View file

@ -479,7 +479,8 @@ if [ "$USER" != '*' ]; then
exclusion=$(echo "$USER" |tr ',' '\n' |grep "^$udir$") exclusion=$(echo "$USER" |tr ',' '\n' |grep "^$udir$")
if [ -z "$exclusion" ]; then if [ -z "$exclusion" ]; then
((i ++)) ((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 echo -e "$(date "+%F %T") adding $udir" |tee -a $BACKUP/$user.log
# Backup files and dirs # Backup files and dirs

2
bin/v-list-user-backups
View file

@ -22,7 +22,7 @@ json_list() {
i=1 i=1
objects=$(grep BACKUP $USER_DATA/backup.conf |wc -l) objects=$(grep BACKUP $USER_DATA/backup.conf |wc -l)
echo "{" echo "{"
while read str; do while read -r str; do
eval $str eval $str
echo -n ' "'$BACKUP'": { echo -n ' "'$BACKUP'": {
"TYPE": "'$TYPE'", "TYPE": "'$TYPE'",