Diff
1diff --git a/CHANGELOG b/CHANGELOG
2index 54c388e4fdd4de09ef91a560046fd5fccfd44e6b..b1ea7c4fd787492109a11ada18555993aaabfcdc 100644
3--- a/CHANGELOG
4+++ b/CHANGELOG
5@@ -1,38 +1,41 @@
6-Version Four (marionline)
7- * Add --list-files to view in the standart-output files stored in my archive
8- * Modification on --restore: if I provide a path to --restore option I don't want to answare a confermation question too
9-
10-Version Four (0.4)
11+0.4 Version Four (03/13/10)
12+===========================
13
14 * Moved the source code to github
15- * Added command line --restore to path (rather than script specific)
16- * Added --restore-file option
17+ * Add --list-files to view in the standart-output files stored in my archive [mariononline]
18+ * Added ECHO command to troublshoot the code when needed
19+ * Added command line --restore to path & removed RESTORE variable [mariononline]
20+ * Added --restore-file option [mariononline]
21 * Changed --backup-this-script to --backup-scrip
22 * Added README to --backup-script
23 * Force use of --backup option (no accidently running the script)
24+ * Added help text to the command line script itself [mariononline]
25 * Script without options shows --help and current directory settings
26- * Removed the RESTORE variable from the script (command line now)
27- * Removed --test option (can't remember what it is for)
28+ * Script checks to make sure you have put some variables in before it runs [mariononline]
29+ * A number of other minor changes
30
31 Version Three (01/31/09)
32+========================
33
34- 1. Added comment to explain why folks need to use s3+ and not s3: for Amazon buckets
35- 2. Used "unset" to remove the variables at end of the script
36- 3. Fixed a problem when the backup folder on S3 was nested inside another bucket
37- 4. Changed the PASSPHRASE field to default to the actual passphrase, so one can easily backup the entire script and not have to worry about the passphrase.
38- 5. Added --backup-this-script option which will turn the script and the secret key into an encrypted tarball that can be kept somewhere safe for easy restores if the machine goes down.
39- 6. Cleaned up the get_file_size function so it wouldn't run when it wasn't supposed to.
40+ * Added comment to explain why folks need to use 's3+' and not 's3:' for Amazon buckets
41+ * Used "unset" to remove the variables at end of the script
42+ * Fixed a problem when the backup folder on S3 was nested inside another bucket
43+ * Changed the PASSPHRASE field to default to the actual passphrase, so one can easily backup the entire script and not have to worry about the passphrase.
44+ * Added --backup-this-script option which will turn the script and the secret key into an encrypted tarball that can be kept somewhere safe for easy restores if the machine goes down.
45+ * Cleaned up the get_file_size function so it wouldn't run when it wasn't supposed to.
46
47 Version Two (12/03/08)
48+======================
49
50- 1. added GPL license
51- 2. changed the cleanup feature to automatically force a full backup after (n) number of days as well as automatically cleanup after (n) number of days
52- 3. added option to force cleanup after (n) number of full backups (rather than by days)
53- 4. option to changed log file ownership
54- 5. runtime checks for installed required software and write permissions on log directory
55- 6. fixed formatting of logfile to be a little more consistent
56- 7. setup everything in clever functions
57+ * added GPL license
58+ * changed the cleanup feature to automatically force a full backup after (n) number of days as well as automatically cleanup after (n) number of days
59+ * added option to force cleanup after (n) number of full backups (rather than by days)
60+ * option to changed log file ownership
61+ * runtime checks for installed required software and write permissions on log directory
62+ * fixed formatting of logfile to be a little more consistent
63+ * setup everything in clever functions
64
65 Version One (11/24/08)
66+======================
67
68- 1. Initial release.
69+* Initial release.
70diff --git a/README b/README
71index cdc7717e08ada94644f87e941dc6fb46a3a7621a..d27c3c2d20d085b2570e5734fbbeefa20b8885f6 100644
72--- a/README
73+++ b/README
74@@ -35,7 +35,7 @@ REQUIREMENTS
75
76 * duplicity
77 * gpg
78-* Amazon S3 account
79+* Amazon S3
80 * s3cmd (optional)
81
82 COMMON USAGE EXAMPLES