diff --git a/mysqlbu-scripts.sh b/mysqlbu-scripts.sh index dfed1e2..7cf628d 100755 --- a/mysqlbu-scripts.sh +++ b/mysqlbu-scripts.sh @@ -30,7 +30,7 @@ fi MYSQLDATA="`grep --perl-regexp --only-match '(?<=datadir=).+' "$MYSQLCFG"`" DAY_BACKUP_DIR="${BACKUP_PATH}/`date +%Y-%m-%d`/" BASE_BACKUP="`ls -1 $DAY_BACKUP_DIR 2> /dev/null | grep --max-count=1 --perl-regexp '^.+_BASE'`" -LATEST_BACKUP="`ls -1 $DAY_BACKUP_DIR 2> /dev/null | grep --max-count=1 --perl-regexp '^.+_BASE'`" +LATEST_BACKUP="`ls -1t $DAY_BACKUP_DIR | grep --max-count=1 --perl-regexp '^.+-'`" LIST_BACKUPS(){ mysqlbu list @@ -207,6 +207,8 @@ case $1 in $0 backup-incremental fi + ln -sfn ${LATEST_BACKUP} ${BACKUP_PATH}/latest + allfiles=`ls -1 ${BACKUP_PATH}` files=(`ls -1 ${BACKUP_PATH} | tail -${BACKUPSTOKEEP}`) for i in $allfiles; do @@ -240,7 +242,7 @@ case $1 in # innobackupex --defaults-file="$MYSQLCFG" --user="$MYSQLUSER" --password="$MYSQLPASS" --no-timestamp "$DEST_DIR" ${BACKUP_DAEMON} --backup ${BACKUPHOSTIP} ${BACKUPHOSTPORT} --target-dir="$DEST_DIR" --user="$MYSQLUSER" --password="$MYSQLPASS" - ln -sfn ${DAY_BACKUP_DIR}${BASE_BACKUP} ${BACKUP_PATH}/latest + #ln -sfn ${DAY_BACKUP_DIR}${BASE_BACKUP} ${BACKUP_PATH}/latest ;; 'backup-incremental') DEST_DIR="${DAY_BACKUP_DIR}`date +%H-%M-%S`" @@ -259,7 +261,7 @@ case $1 in #--incremental "$DEST_DIR" \ #--no-timestamp ${BACKUP_DAEMON} --backup ${BACKUPHOSTIP} ${BACKUPHOSTPORT} --target-dir="$DEST_DIR" --incremental-basedir="${DAY_BACKUP_DIR}${BASE_BACKUP}" --user="$MYSQLUSER" --password="$MYSQLPASS" - ln -sfn ${LATEST_BACKUP} ${BACKUP_PATH}/latest + # ln -sfn ${LATEST_BACKUP} ${BACKUP_PATH}/latest ;; 'restore') if [ "`ps aux | grep --only-match mysqld`" != "" ]; then