diff --git a/osync.sh b/osync.sh index 974817b..9369bdd 100755 --- a/osync.sh +++ b/osync.sh @@ -3,8 +3,8 @@ PROGRAM="Osync" # Rsync based two way sync engine with fault tolerance AUTHOR="(L) 2013-2015 by Orsiris \"Ozy\" de Jong" CONTACT="http://www.netpower.fr/osync - ozy@netpower.fr" -PROGRAM_VERSION=1.00pre -PROGRAM_BUILD=2406201501 +PROGRAM_VERSION=1.00pre-hotfix22 +PROGRAM_BUILD=2406201502 ## 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 @@ -1179,9 +1179,9 @@ function _delete_local if [ $dryrun -ne 1 ] then - if [ -e "$REPLICA_DIR$3$files" ] + if [ -e "$REPLICA_DIR$3/$files" ] then - rm -rf "$REPLICA_DIR$3$files" + rm -rf "$REPLICA_DIR$3/$files" fi mv -f "$REPLICA_DIR$files" "$REPLICA_DIR$3" if [ $? != 0 ] @@ -1286,9 +1286,9 @@ $SSH_CMD error_alert=0 sync_on_changes=$sync_on_changes silent=$silent DEBUG=$DE if [ $dryrun -ne 1 ] then - if [ -e "$REPLICA_DIR$DELETE_DIR$files" ] + if [ -e "$REPLICA_DIR$DELETE_DIR/$files" ] then - $COMMAND_SUDO rm -rf "$REPLICA_DIR$DELETE_DIR$files" + $COMMAND_SUDO rm -rf "$REPLICA_DIR$DELETE_DIR/$files" fi $COMMAND_SUDO mv -f "$REPLICA_DIR$files" "$REPLICA_DIR$DELETE_DIR" if [ $? != 0 ]