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

Hotfix #22 - Missing full path in soft deletion

This commit is contained in:
deajan 2015-06-26 16:31:11 +02:00
parent 9aa2e1166e
commit 54c13b85ef
2 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -3,6 +3,7 @@ SHORT FUTURE IMPROVEMENTS
------------------------- -------------------------
- Tree functions execute piped commands (grep, awk) on local system when launched on remote slave which can cause more bandwith usage - Tree functions execute piped commands (grep, awk) on local system when launched on remote slave which can cause more bandwith usage
- Function calls give variables like $1, $2 etc. Reassign them to local variables with better names for easier code reading
FAR FUTURE IMPROVEMENTS FAR FUTURE IMPROVEMENTS
----------------------- -----------------------
@ -31,6 +32,7 @@ UNDER WORK
RECENT CHANGES RECENT CHANGES
-------------- --------------
- Fixed #22 (missing full path in soft deletion)
- Fixed #21 by adding portable shell readlink / realpath from https://github.com/mkropat/sh-realpath - Fixed #21 by adding portable shell readlink / realpath from https://github.com/mkropat/sh-realpath
- Added detection of osync.sh script in osync-batch.sh to overcome mising path in crontab - Added detection of osync.sh script in osync-batch.sh to overcome mising path in crontab
- Fixed osync-batch.sh script when osync is in executable path like /usr/local/bin - Fixed osync-batch.sh script when osync is in executable path like /usr/local/bin

24
osync.sh
View File

@ -1,10 +1,10 @@
#!/usr/bin/env bash 2#!/usr/bin/env bash
PROGRAM="Osync" # Rsync based two way sync engine with fault tolerance PROGRAM="Osync" # Rsync based two way sync engine with fault tolerance
AUTHOR="(L) 2013-2015 by Orsiris \"Ozy\" de Jong" AUTHOR="(L) 2013-2015 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=1.00pre-hotfix22 PROGRAM_VERSION=1.00pre-hotfix2#22
PROGRAM_BUILD=2406201502 PROGRAM_BUILD=2606201501
## type doesn't work on platforms other than linux (bash). If if doesn't work, always assume output is not a zero exitcode ## type doesn't work on platforms other than linux (bash). If if doesn't work, always assume output is not a zero exitcode
if ! type -p "$BASH" > /dev/null if ! type -p "$BASH" > /dev/null
@ -870,7 +870,7 @@ function RsyncExcludeFrom
function WriteLockFiles function WriteLockFiles
{ {
echo $SCRIPT_PID > "$MASTER_LOCK" echo $SCRIPT_PID > "$MASTER_LOCK" 2> "$LOG_FILE"
if [ $? != 0 ] if [ $? != 0 ]
then then
LogError "Could not set lock on master replica." LogError "Could not set lock on master replica."
@ -1183,7 +1183,15 @@ function _delete_local
then then
rm -rf "$REPLICA_DIR$3/$files" rm -rf "$REPLICA_DIR$3/$files"
fi fi
# In order to keep full path on soft deletion, create parent directories before move
parentdir="$(dirname "$files")"
if [ "$parentdir" != "." ]
then
mkdir --parents "$REPLICA_DIR$3/$parentdir"
mv -f "$REPLICA_DIR$files" "$REPLICA_DIR$3/$parentdir"
else
mv -f "$REPLICA_DIR$files" "$REPLICA_DIR$3" mv -f "$REPLICA_DIR$files" "$REPLICA_DIR$3"
fi
if [ $? != 0 ] if [ $? != 0 ]
then then
LogError "Cannot move $REPLICA_DIR$files to deletion directory." LogError "Cannot move $REPLICA_DIR$files to deletion directory."
@ -1290,7 +1298,15 @@ $SSH_CMD error_alert=0 sync_on_changes=$sync_on_changes silent=$silent DEBUG=$DE
then then
$COMMAND_SUDO rm -rf "$REPLICA_DIR$DELETE_DIR/$files" $COMMAND_SUDO rm -rf "$REPLICA_DIR$DELETE_DIR/$files"
fi fi
# In order to keep full path on soft deletion, create parent directories before move
parentdir="$(dirname "$files")"
if [ "$parentdir" != "." ]
then
$COMMAND_SUDO mkdir --parents "$REPLICA_DIR$DELETE_DIR/$parentdir"
$COMMAND_SUDO mv -f "$REPLICA_DIR$files" "$REPLICA_DIR$DELETE_DIR/$parentdir"
else
$COMMAND_SUDO mv -f "$REPLICA_DIR$files" "$REPLICA_DIR$DELETE_DIR" $COMMAND_SUDO mv -f "$REPLICA_DIR$files" "$REPLICA_DIR$DELETE_DIR"
fi
if [ $? != 0 ] if [ $? != 0 ]
then then
LogError "Cannot move $REPLICA_DIR$files to deletion directory." LogError "Cannot move $REPLICA_DIR$files to deletion directory."