Commit graph

113 commits

Author SHA1 Message Date
Laurent
5d1027fd78 Merge pull request #21 from efournie/efournie-master
Force deleting INPROGRESS_FILE

Avoids waiting for user input if rm is aliased to rm -i
2013-11-25 10:17:53 -08:00
Eric Fournie
928b32f83e Force deleting INPROGRESS_FILE (avoids waiting for user input if rm is aliased to rm -i) 2013-11-25 14:47:18 +00:00
Laurent Cozic
b8fb75bbc0 Removed dangerous and unneeded delete flags.
Since there's normally nothing in the destination directory, the
delete flags are not really needed.
2013-11-24 17:23:00 +08:00
Robert Bruce Park
9ece9fbec3 Fix spaces in filenames. 2013-11-23 01:18:08 -08:00
Robert Bruce Park
392b8089a5 Add a simple script for running rsync_tmbackup.sh from cron. 2013-11-23 01:07:31 -08:00
Laurent Cozic
d31b689f6b Removed old backup deletion prompt, and formatting tweaks.
- Removed old backup deletion prompt as it's not really needed.
- Made all variables uppercase for consistency.
- Used double square brackets in `if` statements.
2013-11-16 22:50:10 +08:00
Laurent Cozic
81d6b4fb99 Merge branch 'master' of https://github.com/laurent22/rsync-time-backup 2013-11-16 22:20:07 +08:00
Laurent
12784d1d32 Merge pull request #14 from robru/master
Time Machine style backup pruning.
2013-11-16 06:17:54 -08:00
Robert Bruce Park
f5a4275a04 Merge master. 2013-11-15 23:07:01 -08:00
Robert Bruce Park
a474f139f5 Stop creating "latest" symlink (implemented in a different branch).
This reverts commit 28735b1815.
2013-11-15 23:02:24 -08:00
Robert Bruce Park
28735b1815 Create "latest" symlink pointing at the most recent completed backup. 2013-11-15 12:01:52 -08:00
Robert Bruce Park
f011e1a7ab More elegant cross-platform date logic. 2013-11-15 11:08:28 -08:00
Robert Bruce Park
9b9a564447 More robust date handling.
Previously the date handling expiry logic had a bug where if you had
backups that were a year apart to the day, it wouldn't notice the
difference in year and only notice that the month was the same, and
expire the older one (eg, if you had a backup on 2012-04-01 and
another on 2013-04-01, it'd delete the one from 2012. This commit
makes it compare the full date string instead of just the month, so
that it more robustly keeps older backups.
2013-11-15 10:35:04 -08:00
Robert Bruce Park
ae7998025a Add MacOSX compatibility. 2013-11-15 10:24:52 -08:00
Laurent Cozic
e092d5c2fd Updated list of features in README 2013-11-15 18:06:49 +08:00
Laurent Cozic
2ade9de422 Fixed latest backup symlink issues
Code was in the wrong place (link being added when the backup failed only).
Also made the symlink relative to the current folder so that the drive
can be mounted with a different path.
2013-11-15 17:20:16 +08:00
Laurent
85fea581a6 Merge pull request #15 from mumrah/master
Add a "latest" symlink when backup is successful
2013-11-15 01:16:05 -08:00
Robert Bruce Park
324a3ffc9a Whitespace fix, oops. 2013-11-14 19:36:32 -08:00
Robert Bruce Park
12deac25d6 Correctly handle most recent backup if it's older than 24hs.
Code was assuming that you'd run backups hourly, eg, so you'd have
many backups within the last 24 hours. Code assumed that by the time
you found a backup more than 24h old, you'd already have a value for
$prev set. In the event that your most recent backup is more than 24
hours old, $prev would not be set and bash would get an error "unary
operator expected" when it tried to compare the day of the newest
backup to the empty $prev value.

I fix this by setting a default value for $prev, one that cannot be
mistaken for an existing backup because it does not represent a valid
date. This ensures that the most recent backup is correctly preserved
regardless of it's age.
2013-11-14 19:31:22 -08:00
Robert Bruce Park
855c77a83f Simplify fn_is_backup_destination implementation. 2013-11-14 19:03:26 -08:00
Robert Bruce Park
4250423d98 Make fn_expire_backup more robust. 2013-11-14 18:50:34 -08:00
David Arthur
0c679903af Fixed
Brain fart
2013-11-13 15:52:24 -05:00
Robert Bruce Park
584e3a9b4b Drop BACKUP_FOLDER_PATTERN since it's now only used in one place. 2013-11-13 10:53:13 -08:00
Robert Bruce Park
19446c24b9 Take the training wheels off ;-) 2013-11-13 10:34:47 -08:00
David Arthur
bda24be003 Add a "latest" symlink when backup is successful 2013-11-13 13:29:08 -05:00
Robert Bruce Park
8bb5b3f265 Rearrange function definitions. 2013-11-13 10:21:47 -08:00
Robert Bruce Park
a67efdd0f1 Implement fn_expire_backups to reduce code duplication. 2013-11-13 10:17:41 -08:00
Robert Bruce Park
32e71ce9aa Implement fn_find_backups to reduce code duplication. 2013-11-13 10:16:27 -08:00
Robert Bruce Park
72df5bf33e Rebase on master. 2013-11-13 09:16:31 -08:00
Robert Bruce Park
fe0bfde041 More robust path handling. 2013-11-13 09:12:50 -08:00
Laurent
8a2e91813b Update README.md
Now done: "Check if there's enough space in the destination before doing the backup. Also automatically delete old backups."
2013-11-13 17:57:51 +08:00
Laurent Cozic
c505ecbfb8 Merge branch 'master' of https://github.com/rastkov/rsync-time-backup into rastkov-master
Conflicts:
	rsync_tmbackup.sh
2013-11-13 17:51:15 +08:00
Laurent Cozic
159d8b6416 Merge branch 'master' of https://github.com/laurent22/rsync-time-backup
Conflicts:
	rsync_tmbackup.sh
2013-11-13 17:47:58 +08:00
Laurent Cozic
2fd6b109f0 Using find instead of ls to find the last and second last directory used for backup. 2013-11-13 17:46:20 +08:00
Robert Bruce Park
d425a05528 Initial implementation of Time Machine style backup pruning.
Within 24 hours, all backups are kept. Within 1 month, only the most
recent backup for each day is kept. For all previous backups, only the
most recent of each month is kept.

This is not *quite* the same as Time Machine, but this implementation
is a lot easier to do since it is based on string comparisons of the
dates and doesn't require any "hard" date logic.

Also this commit just 'echo's what will be deleted, and does not
actually delete anything yet because I am still testing it.
2013-11-13 00:01:17 -08:00
Laurent Cozic
c23f47164e Merge branch 'master' of https://github.com/tyriis/rsync-time-backup into tyriis-master
Changed regex for grep iirc POSIX mode

Conflicts:
	rsync_tmbackup.sh
2013-11-12 15:50:02 +08:00
Laurent Cozic
9128fa2a6f Merge branch 'master' of https://github.com/tyriis/rsync-time-backup into tyriis-master
Conflicts:
	rsync_tmbackup.sh
2013-11-12 15:40:00 +08:00
Laurent Cozic
1f5aabc31f Merge branch 'master' of https://github.com/laurent22/rsync-time-backup
Conflicts:
	rsync_tmbackup.sh
2013-11-12 15:31:20 +08:00
Laurent Cozic
b481985f2a Move more setup code inside loop 2013-11-12 11:14:02 +08:00
Laurent
84415a3045 Delete rsync_tmbackup.sh.bak 2013-11-07 17:50:32 +08:00
Laurent
00ba40b617 Merge pull request #11 from Flimm/master
Deal with arguments with special characters better
2013-11-07 01:06:50 -08:00
David D Lowe
24540f33ee Handle source and dest arguments with spaces 2013-11-07 08:51:12 +00:00
Laurent Cozic
d8fa4fa847 Delete old backup when no more space on destination 2013-11-05 16:08:23 +08:00
rastkov
99258d80ab Update rsync_tmbackup.sh
Set LAST_TIME, LINE_CONUT and SECOND_LAST_TIME based on `uname -s` output for Mac OS compatibility.
2013-11-01 14:32:59 +01:00
rastkov
27a0a1881f Update rsync_tmbackup.sh
Using find with regex instead of glob
2013-11-01 08:48:21 +01:00
nils biesalski
c046c4dd42 Changed regex for grep iirc POSIX mode
http://stackoverflow.com/questions/6901171/is-d-not-supported-by-greps-basic-expressions
2013-10-31 13:51:08 +01:00
David D Lowe
396b42d483 Deal with arguments with special characters better
Script now handles filenames with special characters (such as spaces,
hard tabs, newlines, double quotes and a dash prefix). The only
exceptions are filenames with single quotes. In this case, the script
will fail early with a clear error message.
2013-10-30 13:45:48 +00:00
rastkov
8318db90c5 Update rsync_tmbackup.sh 2013-10-29 12:15:38 +01:00
rastkov
a40a733902 Update rsync_tmbackup.sh
Using find instead of ls to find the last and second last directory used for backup.
2013-10-29 12:07:30 +01:00
Laurent
1b0b115dd0 Merge pull request #5 from bitdeli-chef/master
Add a Bitdeli Badge to README
2013-10-28 10:03:24 -07:00