WMDE
/
osync
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added follow symlink option + other minor fixes

This commit is contained in:
deajan 2014-05-27 11:35:45 +02:00
parent d8ff286b32
commit fa19036de6
3 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGELOG.md
View File

@ -14,16 +14,19 @@ FAR FUTURE IMPROVEMENTS
KNOWN ISSUES KNOWN ISSUES
------------ ------------
- Still need more testing on BSD, MacOSX and Windows MSYS - RC3 is tested against Linux, FreeBSD and MacOS X. More testing needed in MSYS Windows environment.
- Cannot finish sync if one replica contains a directory and the other replica contains a file named the same way (Unix doesn't allow this) - Cannot finish sync if one replica contains a directory and the other replica contains a file named the same way (Unix doesn't allow this)
UNDER WORK UNDER WORK
---------- ----------
- sync test automation
RECENT CHANGES RECENT CHANGES
-------------- --------------
- Added follow symlink parameter
- Minor fixes in parameter list when bandwidth parameter is used
- Added some additionnal checks for *BSD and MacOS environments - Added some additionnal checks for *BSD and MacOS environments
- Changed /bin/bash to /usr/bin/env bash for sanity on other systems, also check for bash presence before running - Changed /bin/bash to /usr/bin/env bash for sanity on other systems, also check for bash presence before running
- Changed default behavior for quick sync tasks: Will try to resume failed sync tasks once - Changed default behavior for quick sync tasks: Will try to resume failed sync tasks once

18
osync.sh
View File

@ -4,7 +4,7 @@ PROGRAM="Osync" # Rsync based two way sync engine with fault tolerance
AUTHOR="(L) 2013-2014 by Orsiris \"Ozy\" de Jong" AUTHOR="(L) 2013-2014 by Orsiris \"Ozy\" de Jong"
CONTACT="http://www.netpower.fr/osync - ozy@netpower.fr" CONTACT="http://www.netpower.fr/osync - ozy@netpower.fr"
PROGRAM_VERSION=0.99RC3 PROGRAM_VERSION=0.99RC3
PROGRAM_BUILD=2605201403 PROGRAM_BUILD=2705201401
if ! type -p "$BASH" > /dev/null if ! type -p "$BASH" > /dev/null
then then
@ -1712,23 +1712,27 @@ function Init
if [ "$PRESERVE_ACL" == "yes" ] if [ "$PRESERVE_ACL" == "yes" ]
then then
RSYNC_ARGS=$RSYNC_ARGS"A" RSYNC_ARGS=$RSYNC_ARGS" -A"
fi fi
if [ "$PRESERVE_XATTR" == "yes" ] if [ "$PRESERVE_XATTR" == "yes" ]
then then
RSYNC_ARGS=$RSYNC_ARGS"X" RSYNC_ARGS=$RSYNC_ARGS" -X"
fi fi
if [ "$RSYNC_COMPRESS" == "yes" ] if [ "$RSYNC_COMPRESS" == "yes" ]
then then
RSYNC_ARGS=$RSYNC_ARGS"z" RSYNC_ARGS=$RSYNC_ARGS" -z"
fi fi
if [ "$COPY_SYMLINKS" == "yes" ]
then
RSYNC_ARGS=$RSYNC_ARGS" -L"
fi
if [ "$PRESERVE_HARDLINKS" == "yes" ] if [ "$PRESERVE_HARDLINKS" == "yes" ]
then then
RSYNC_ARGS=$RSYNC_ARGS"H" RSYNC_ARGS=$RSYNC_ARGS" -H"
fi fi
if [ $dryrun -eq 1 ] if [ $dryrun -eq 1 ]
then then
RSYNC_ARGS=$RSYNC_ARGS"n" RSYNC_ARGS=$RSYNC_ARGS" -n"
DRY_WARNING="/!\ DRY RUN" DRY_WARNING="/!\ DRY RUN"
fi fi
@ -1830,7 +1834,7 @@ function InitRemoteOSSettings
## MacOSX does not use the -E parameter like Linux or BSD does (-E is mapped to extended attrs instead of preserve executability) ## MacOSX does not use the -E parameter like Linux or BSD does (-E is mapped to extended attrs instead of preserve executability)
if [ "$LOCAL_OS" != "MacOSX" ] && [ "$REMOTE_OS" != "MacOSX" ] if [ "$LOCAL_OS" != "MacOSX" ] && [ "$REMOTE_OS" != "MacOSX" ]
then then
RSYNC_ARGS=$RSYNC_ARGS"E" RSYNC_ARGS=$RSYNC_ARGS" -E"
fi fi
if [ "$REMOTE_OS" == "msys" ] if [ "$REMOTE_OS" == "msys" ]

6
sync.conf
View File

@ -2,7 +2,7 @@
###### Osync - Rsync based two way sync engine with fault tolerance ###### Osync - Rsync based two way sync engine with fault tolerance
###### (L) 2013-2014 by Orsiris "Ozy" de Jong (www.netpower.fr) ###### (L) 2013-2014 by Orsiris "Ozy" de Jong (www.netpower.fr)
###### Config file rev 2605201401 ###### Config file rev 2705201401
## ---------- GENERAL OPTIONS ## ---------- GENERAL OPTIONS
@ -67,6 +67,8 @@ RSYNC_REMOTE_PATH=""
PRESERVE_ACL=no PRESERVE_ACL=no
## Preserve Xattr. Make sure source and target FS can manage same Xattrs or you'll get loads of errors. ## Preserve Xattr. Make sure source and target FS can manage same Xattrs or you'll get loads of errors.
PRESERVE_XATTR=no PRESERVE_XATTR=no
## Transforms symlinks into referent files/dirs
COPY_SYMLINKS=no
## Preserve hard links. Make sure source and target FS can manage hard links or you will lose them. ## Preserve hard links. Make sure source and target FS can manage hard links or you will lose them.
PRESERVE_HARDLINKS=no PRESERVE_HARDLINKS=no
@ -80,7 +82,7 @@ HARD_MAX_EXEC_TIME=10600
## Minimum time (in seconds) in file monitor mode between modification detection and sync task in order to let copy operations finish. ## Minimum time (in seconds) in file monitor mode between modification detection and sync task in order to let copy operations finish.
MIN_WAIT=60 MIN_WAIT=60
## ---------- BACKUP AND TRASH OPTIONS ## ---------- BACKUP AND DELETION OPTIONS
## Enabling this option will keep a backup of a file on the target replica if it gets updated from the source replica. Backups will be made to .osync_workdir/backups ## Enabling this option will keep a backup of a file on the target replica if it gets updated from the source replica. Backups will be made to .osync_workdir/backups
CONFLICT_BACKUP=yes CONFLICT_BACKUP=yes