Skip to content

Commit

Permalink
Rename repository from 'duplicity-backup' to 'duplicity-backup.sh'
Browse files Browse the repository at this point in the history
  • Loading branch information
zertrin committed Oct 23, 2016
1 parent b207b90 commit 6ba17fa
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 15 deletions.
18 changes: 9 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[![Build Status](https://travis-ci.org/zertrin/duplicity-backup.svg?branch=dev)](https://travis-ci.org/zertrin/duplicity-backup)
[![Build Status](https://travis-ci.org/zertrin/duplicity-backup.sh.svg?branch=dev)](https://travis-ci.org/zertrin/duplicity-backup.sh)

# duplicity-backup.sh

Expand Down Expand Up @@ -31,20 +31,20 @@ This means the following:

## Contributing

The development version of the code is available at https://github.com/zertrin/duplicity-backup in the `dev` branch. It is a bleeding-edge version with the latests changes that have not yet been tested a lot, but that's the best starting point to contribute.
The development version of the code is available at https://github.com/zertrin/duplicity-backup.sh in the `dev` branch. It is a bleeding-edge version with the latests changes that have not yet been tested a lot, but that's the best starting point to contribute.

Pull requests are welcome! However please **always use individual feature branches for each pull request**. I may not accept a pull request from a master or dev branch.

Here is how to do it:

Fork the repository first and then clone your fork on your machine:

git clone [email protected]:YOURNAME/duplicity-backup.git
git clone [email protected]:YOURNAME/duplicity-backup.sh.git duplicity-backup
cd duplicity-backup

Add a remote for the upstream repository:

git remote add upstream [email protected]:zertrin/duplicity-backup.git
git remote add upstream [email protected]:zertrin/duplicity-backup.sh.git
git fetch upstream

Create a new topic branch for the changes you want to make, based on the `dev` branch from upstream:
Expand All @@ -66,7 +66,7 @@ If you want to open another pull request for another change which is independant

You can clone the repository (which makes it easy to get future updates):

git clone https://github.com/zertrin/duplicity-backup.git duplicity-backup
git clone https://github.com/zertrin/duplicity-backup.sh.git duplicity-backup

If you prefer the stable version do:

Expand All @@ -80,8 +80,8 @@ If you prefer the stable version do:

Or just download the ZIP file:

* For the stable branch: https://github.com/zertrin/duplicity-backup/archive/stable.zip
* For the normal branch: https://github.com/zertrin/duplicity-backup/archive/master.zip
* For the stable branch: https://github.com/zertrin/duplicity-backup.sh/archive/stable.zip
* For the normal branch: https://github.com/zertrin/duplicity-backup.sh/archive/master.zip

### 2. Configure the script

Expand Down Expand Up @@ -253,7 +253,7 @@ If your system's locale is not english, an error can happen when duplicity is tr

This script attempts to simplify the task of running a duplicity command; if you are having any problems with the script the first step is to determine if the script is generating an incorrect command or if duplicity itself is causing your error.

To see exactly what is happening when you run duplicity-backup, either pass the option `-d` or `--debug` on the command line, or head to the bottom of the configuration file and uncomment the `ECHO=$(which echo)` variable.
To see exactly what is happening when you run duplicity-backup.sh, either pass the option `-d` or `--debug` on the command line, or head to the bottom of the configuration file and uncomment the `ECHO=$(which echo)` variable.

This will stop the script from running and will, instead, output the generated command into your log file. You can then check to see if what is being generated is causing an error or if it is duplicity causing you woe.

Expand All @@ -266,5 +266,5 @@ You can also try the `-n` or `--dry-run` option. This will make duplicity to cal
* Show backup-ed files in today incremental backup email


###### Thanks to all the [contributors](https://github.com/zertrin/duplicity-backup/graphs/contributors) for their help.
###### Thanks to all the [contributors](https://github.com/zertrin/duplicity-backup.sh/graphs/contributors) for their help.

6 changes: 3 additions & 3 deletions duplicity-backup.conf.example
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#
# Copyright (c) 2008-2010 Damon Timm.
# Copyright (c) 2010 Mario Santagiuliana.
# Copyright (c) 2012-2015 Marc Gallet.
# Copyright (c) 2012-2016 Marc Gallet.
#
# This program is free software: you can redistribute it and/or modify it under
# the terms of the GNU General Public License as published by the Free Software
Expand All @@ -23,10 +23,10 @@
# http://damontimm.com/code/dt-s3-backup (for the original program by Damon Timm)
#
# Latest code available at:
# http://github.com/zertrin/duplicity-backup
# http://github.com/zertrin/duplicity-backup.sh
#
# List of contributors:
# https://github.com/zertrin/duplicity-backup/graphs/contributors
# https://github.com/zertrin/duplicity-backup.sh/graphs/contributors
#
# ---------------------------------------------------------------------------- #

Expand Down
9 changes: 6 additions & 3 deletions duplicity-backup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#
# Copyright (c) 2008-2010 Damon Timm.
# Copyright (c) 2010 Mario Santagiuliana.
# Copyright (c) 2012 Marc Gallet.
# Copyright (c) 2012-2016 Marc Gallet.
#
# This program is free software: you can redistribute it and/or modify it under
# the terms of the GNU General Public License as published by the Free Software
Expand All @@ -23,7 +23,10 @@
# http://damontimm.com/code/dt-s3-backup (for the original program by Damon Timm)
#
# Latest code available at:
# http://github.com/zertrin/duplicity-backup
# http://github.com/zertrin/duplicity-backup.sh
#
# List of contributors:
# https://github.com/zertrin/duplicity-backup.sh/graphs/contributors
#
# ---------------------------------------------------------------------------- #

Expand Down Expand Up @@ -78,7 +81,7 @@ echo "USAGE:
the current working directory
-q, --quiet silence most of output messages, except errors and output
that is intended for interactive usage. Silenced output
that are intended for interactive usage. Silenced output
is still logged in the logfile.
-n, --dry-run perform a trial run with no changes made
Expand Down

0 comments on commit 6ba17fa

Please sign in to comment.