74a5483006d55d280f60a14492ac1b4e44b96020

Message

Added Mario's changes (with minor bug fix and text changes) - seems to be in a working state at this point.  needs more TO DOs accomplished.

Diff

This diff is truncated to protect this page.

  1diff --git a/README b/README
  2index 158945a7d06c5e365bc91e3ad4b7ada7f2cefe27..35dbc60a82c5554a380210f34e3386eae7694b0e 100644
  3--- a/README
  4+++ b/README
  5@@ -1,5 +1,12 @@
  6-Hello!
  7+**NOTE: currently, the script is undergoing some changes!  You should use version 3 (0.3) for the time being until we have all the bugs/kinks sorted out.
  8 
  9-Am in the process of preparing this project for some public input -- bear with me while I get everything in order.
 10+More information about this script avaiable at: http://damontimm.com/code/dt-s3-backup
 11+
 12+TO DO:
 13+
 14+* Use "--backup" as required option and have script output "--help" when run with no options
 15+* Fix "--display-config" to show the full array of include/exclude options (not just one)
 16+* Remove the RESTORE variable from the script and only take it from inputing on the command line (thereby only needing one option "--restore" and merging it with "--restore-to-path" ... this is for simplicities sake
 17+* Add a README file to the "--backup-this-script" option because, if you are like me, when it is working for so long I forget what to do when it comes time to restore
 18+* Clean up general formatting of the script and make it pretty 
 19 
 20--Damon
 21diff --git a/dt-s3-backup.sh b/dt-s3-backup.sh
 22index 6331c232dba4f86136c6c0cc5d0338d6e7d0cca5..51162e836f24966e6e29bf984f7b16a47e4aa691 100644
 23--- a/dt-s3-backup.sh
 24+++ b/dt-s3-backup.sh
 25@@ -1,64 +1,77 @@
 26 #!/bin/bash
 27 # 
 28-# Copyright (c) 2008-2009 Damon Timm.
 29+# Copyright (c) 2008-2010 Damon Timm.  
 30+# Copyright (c) 2010 Mario Santagiuliana.
 31 #
 32-# This program is free software: you can redistribute it and/or modify
 33-# it under the terms of the GNU General Public License as published by
 34-# the Free Software Foundation, either version 3 of the License, or
 35-# (at your option) any later version.
 36+# This program is free software: you can redistribute it and/or modify it under
 37+# the terms of the GNU General Public License as published by the Free Software
 38+# Foundation, either version 3 of the License, or (at your option) any later
 39+# version.
 40 #
 41-# This program is distributed in the hope that it will be useful,
 42-# but WITHOUT ANY WARRANTY; without even the implied warranty of
 43-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 44-# GNU General Public License for more details.
 45+# This program is distributed in the hope that it will be useful, but WITHOUT
 46+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 47+# FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 48+# details.
 49 #
 50-# You should have received a copy of the GNU General Public License
 51-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 52-#
 53-# ---------------------------------------------------------------------
 54-#
 55-# Version 3 - Jan 31 2009
 56-# Incremental Encrypted Backups with Duplicity and Amazon S3
 57+# You should have received a copy of the GNU General Public License along with
 58+# this program.  If not, see <http://www.gnu.org/licenses/>.
 59+
 60+# ---------------------------------------------------------------------------- #
 61+
 62+# AUTHORS:
 63+
 64+# Damon Timm <usertimm@gmail.com> <http://blog.usertimm.com> Mario
 65+# Santagiuliana <mario@marionline.it> <http://www.marionline.it>
 66+
 67+# VERSION 4 NOTE (02/12/2010):
 68+
 69+# **Code is still being tested - if you want the last stable version, please
 70+# download verion 0.3!**
 71+
 72+# ABOUT THIS SCRIPT:
 73 #
 74 # This bash script was designed to automate and simplify the remote backup
 75-# process using duplicity and Amazon S3.  Hopefully, after the script is 
 76-# configured, you can easily backup, restore, verify and clean without
 77-# having to remember lots of different command options.
 78+# process using duplicity and Amazon S3.  Hopefully, after the script is
 79+# configured, you can easily backup, restore, verify and clean without having
 80+# to remember lots of different command options.
 81 #
 82-# Furthermore, you can even automate the process of saving your script 
 83-# and the gpg key for your backups in a single password-protected file -- 
 84-# this way, you know you have everything you need for a restore, 
 85-# in case your machine goes down.
 86+# Furthermore, you can even automate the process of saving your script and the
 87+# gpg key for your backups in a single password-protected file -- this way, you
 88+# know you have everything you need for a restore, in case your machine goes
 89+# down.
 90 #
 91-# You can run the script from cron with no command-line options 
 92-# (all options set in the script itself); however, you can also run it 
 93-# outside of the cron with some variables for more control.
 94+# You can run the script from cron with no command-line options (all options
 95+# set in the script itself); however, you can also run it outside of the cron
 96+# with some variables for more control.
 97+
 98+# OPTIONS:
 99 #
100-# --full: forces a full backup (instead of waiting specified number of days
101-# --verify: verifies the backup (no cleanup is run)
102-# --restore: restores the backup to the directory specified in the script
103-# --backup-this-script: let's you backup the script and secret key to the
104-#                       current working directory.
105+# --full: forces a full backup (instead of waiting specified number of days)
106+# --verify: verifies the backup (no cleanup is run) 
107+# --restore: restores the backup to the directory specified in the script 
108+# --restore-to-dir [path]: restores the backup to the specified path 
109+# --restore-file [file]: restore a specific file 
110+# --backup-this-script: let's you backup the script and secret key to the 
111+#                       current working directory 
112+# --test: This was a non-duplicity scripting test: check logfile  
113+# --display-config: display directory variables configs in this script 
114+# --help: display help
115+
116+# MORE INFORMATION:
117 #
118-# See more info about the script online at:
119-# blog.damontimm.com/bash-script-incremental-encrypted-backups-duplicity-amazon-s3/
120+# http://usertimm.com/code/dt-s3-backup
121 
122-# TO DO:
123-#   - allow command line restore options (specific files, etc)
124-#   - allow command line cleanup options (# of days [30D] or full backups [2])