From f5c5807ceeef6b6042d66cdce26770cd488e1ebe Mon Sep 17 00:00:00 2001 From: Patrick Uiterwijk Date: Fri, 13 Dec 2013 22:54:46 +0000 Subject: [PATCH] Bash is doing some weird expansion --- files/gnome/backup.sh | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/files/gnome/backup.sh b/files/gnome/backup.sh index dac41c61ff..2550d3df8a 100644 --- a/files/gnome/backup.sh +++ b/files/gnome/backup.sh @@ -36,19 +36,16 @@ BACKUP_DIR='/fedora_backups/gnome/' LOGS_DIR='/fedora_backups/gnome/logs' BACKUP_USER='root' -OPTS='-avz -e "ssh -i /usr/local/etc/gnome_backup_id.rsa" --bwlimit=2000' -IPLESS_OPTS='-avz -e "ssh -A -i /usr/local/etc/gnome_backup_id.rsa bastion.gnome.org" --bwlimit=2000' - for MACHINE in $MACHINES; do - rsync $OPTS $BACKUP_USER@$MACHINE:/etc/rsyncd/backup.exclude $BACKUP_DIR/excludes/$MACHINE.exclude + rsync -avz -e "ssh -i /usr/local/etc/gnome_backup_id.rsa" --bwlimit=2000 $BACKUP_USER@$MACHINE:/etc/rsyncd/backup.exclude $BACKUP_DIR/excludes/$MACHINE.exclude cd $BACKUP_DIR/$MACHINE - rsync $OPTS --exclude-from=$BACKUP_DIR/excludes/$MACHINE.exclude --log-file=$LOGS_DIR/$MACHINE.log $BACKUP_USER@$MACHINE_NAME:/ . + rsync -avz -e "ssh -i /usr/local/etc/gnome_backup_id.rsa" --bwlimit=2000 --exclude-from=$BACKUP_DIR/excludes/$MACHINE.exclude --log-file=$LOGS_DIR/$MACHINE.log $BACKUP_USER@$MACHINE_NAME:/ . done for MACHINE in $IPLESS_MACHINES; do - rsync $IPLESS_OPTS $BACKUP_USER@$MACHINE:/etc/rsyncd/backup.exclude $BACKUP_DIR/excludes/$MACHINE.exclude + rsync -avz -e "ssh -A -i /usr/local/etc/gnome_backup_id.rsa bastion.gnome.org" --bwlimit=2000 $BACKUP_USER@$MACHINE:/etc/rsyncd/backup.exclude $BACKUP_DIR/excludes/$MACHINE.exclude cd $BACKUP_DIR/$MACHINE - rsync $IPLESS_OPTS --exclude-from=$BACKUP_DIR/excludes/$MACHINE.exclude --log-file=$LOGS_DIR/$MACHINE.log $BACKUP_USER@$MACHINE_NAME:/ . + rsync -avz -e "ssh -A -i /usr/local/etc/gnome_backup_id.rsa bastion.gnome.org" --bwlimit=2000 --exclude-from=$BACKUP_DIR/excludes/$MACHINE.exclude --log-file=$LOGS_DIR/$MACHINE.log $BACKUP_USER@$MACHINE_NAME:/ . done # Dailyreport needs the logs to generate the data we need.