Merge pull request #1887 from Myself5/master

v-backup-user: Properly fix userdata backup exclusions
This commit is contained in:
Serghey Rodin 2019-05-23 00:08:06 +03:00 committed by GitHub
commit 58e9615d94
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -460,11 +460,15 @@ if [ "$USER" != '*' ]; then
fi fi
fargs=() fargs=()
for xpath in $(echo "$USER" |tr ',' '\n'); do for xpath in $(echo "$USER" |tr ',' '\n'); do
fargs+=(-not) if [ -d "$xpath" ]; then
fargs+=(-path) fargs+=(--exclude=$xpath/*)
fargs+=("./$xpath*") echo "$(date "+%F %T") excluding directory $xpath" |\
echo "$(date "+%F %T") excluding directory $xpath" |\
tee -a $BACKUP/$user.log tee -a $BACKUP/$user.log
else
echo "$(date "+%F %T") excluding file $xpath" |\
tee -a $BACKUP/$user.log
fargs+=(--exclude=$xpath)
fi
done done
IFS=$'\n' IFS=$'\n'
@ -479,7 +483,7 @@ if [ "$USER" != '*' ]; then
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
tar -cpf- $udir |gzip -$BACKUP_GZIP - > $tmpdir/user_dir/$udir.tar.gz tar --anchored -cpf- ${fargs[@]} $udir |gzip -$BACKUP_GZIP - > $tmpdir/user_dir/$udir.tar.gz
fi fi
done done
set +f set +f