fuxino/simple_backup
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Merge branch 'development'

Browse Source
This commit is contained in:
daniele 2017-06-23 12:17:39 +02:00
commit 71a2b6d01e
1 changed files with 37 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
simple-backup
View File

@ -19,7 +19,11 @@
#Help function #Help function
function help_function { function help_function {
<<<<<<< HEAD
echo "simple_backup, version 1.3.4" echo "simple_backup, version 1.3.4"
=======
echo "simple_backup, version 1.4"
>>>>>>> development
echo "" echo ""
echo "Usage: $0 [OPTIONS]" echo "Usage: $0 [OPTIONS]"
echo "" echo ""
@ -36,8 +40,8 @@ function help_function {
echo " Default: keep all." echo " Default: keep all."
echo "-u, --user USER User performing the backup." echo "-u, --user USER User performing the backup."
echo " Default: current user." echo " Default: current user."
echo " WARNING: This currently doesn't work with" echo "-s, --checksum Use the checksum rsync option to compare files"
echo " other options!" echo " (MUCH slower)."
echo "" echo ""
echo "If no option is given, the program uses the default" echo "If no option is given, the program uses the default"
echo "configuration file: $HOMEDIR/.simple_backup/config." echo "configuration file: $HOMEDIR/.simple_backup/config."
@ -299,6 +303,10 @@ function parse_options {
shift shift
;; ;;
-s | --checksum)
OPTIONS="-arcv -H -X -R"
;;
*) *)
echo "$(date): Backup failed (see errors.log)" >> $LOG echo "$(date): Backup failed (see errors.log)" >> $LOG
echo "Backup failed" echo "Backup failed"