More fixes for remote deletion from PR55
This commit is contained in:
parent
c209fdd116
commit
c234bdf107
|
@ -4,7 +4,7 @@ PROGRAM="osync" # Rsync based two way sync engine with fault tolerance
|
||||||
AUTHOR="(C) 2013-2016 by Orsiris de Jong"
|
AUTHOR="(C) 2013-2016 by Orsiris de Jong"
|
||||||
CONTACT="http://www.netpower.fr/osync - ozy@netpower.fr"
|
CONTACT="http://www.netpower.fr/osync - ozy@netpower.fr"
|
||||||
PROGRAM_VERSION=1.1.1
|
PROGRAM_VERSION=1.1.1
|
||||||
PROGRAM_BUILD=2016080103
|
PROGRAM_BUILD=2016080104
|
||||||
IS_STABLE=yes
|
IS_STABLE=yes
|
||||||
|
|
||||||
source "./ofunctions.sh"
|
source "./ofunctions.sh"
|
||||||
|
@ -920,6 +920,7 @@ $SSH_CMD ERROR_ALERT=0 sync_on_changes=$sync_on_changes _SILENT=$_SILENT _DEBUG=
|
||||||
IFS=$'\r\n'
|
IFS=$'\r\n'
|
||||||
for files in $(cat "$FILE_LIST")
|
for files in $(cat "$FILE_LIST")
|
||||||
do
|
do
|
||||||
|
Logger "Processing file [$file]." "DEBUG"
|
||||||
if [[ "$files" != "$previous_file/"* ]] && [ "$files" != "" ]; then
|
if [[ "$files" != "$previous_file/"* ]] && [ "$files" != "" ]; then
|
||||||
if [ ! -d "$REPLICA_DIR$DELETE_DIR" ]; then
|
if [ ! -d "$REPLICA_DIR$DELETE_DIR" ]; then
|
||||||
$COMMAND_SUDO mkdir -p "$REPLICA_DIR$DELETE_DIR"
|
$COMMAND_SUDO mkdir -p "$REPLICA_DIR$DELETE_DIR"
|
||||||
|
@ -933,6 +934,7 @@ $SSH_CMD ERROR_ALERT=0 sync_on_changes=$sync_on_changes _SILENT=$_SILENT _DEBUG=
|
||||||
Logger "Soft deleting $REPLICA_DIR$files" "NOTICE"
|
Logger "Soft deleting $REPLICA_DIR$files" "NOTICE"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
Logger "Full path for deletion is [$REPLICA_DIR$DELETE_DIR/$files]." "DEBUG"
|
||||||
if [ $_DRYRUN -ne 1 ]; then
|
if [ $_DRYRUN -ne 1 ]; then
|
||||||
if [ -e "$REPLICA_DIR$DELETE_DIR/$files" ]; then
|
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"
|
||||||
|
|
Loading…
Reference in New Issue