diff --git a/upgrade-v1.0x-v1.1x.sh b/upgrade-v1.0x-v1.1x.sh index f0b4b14..7efdf09 100755 --- a/upgrade-v1.0x-v1.1x.sh +++ b/upgrade-v1.0x-v1.1x.sh @@ -6,7 +6,7 @@ AUTHOR="(L) 2015 by Orsiris \"Ozy\" de Jong" CONTACT="http://www.netpower.fr/osync - ozy@netpower.fr" OLD_PROGRAM_VERSION="1.0x" NEW_PROGRAM_VERSION="v1.1x" -PROGRAM_BUILD=2015121502 +PROGRAM_BUILD=2016020801 function Init { OSYNC_DIR=".osync_workdir" @@ -329,10 +329,25 @@ function RewriteConfigFiles { sed -i 's/^SYNC_ID=/INSTANCE_ID=/g' "$config_file" # Add missing config file values - sed -i '/^LOGFILE=*/a RSYNC_PATTERN_FIRST=include' "$config_file" - sed -i '/^RSYNC_EXCLUDE_PATTERN=*/a RSYNC_INCLUDE_PATTERN=""' "$config_file" - sed -i '/^RSYNC_EXCLUDE_FROM=*/a RSYNC_INCLUDE_FROM=""' "$config_file" - sed -i '/^PARTIAL=*/a DELTA_COPIES=yes' "$config_file" + if ! grep "RSYNC_PATTERN_FIRST=" "$config_file" > /dev/null; then + sed -i '/^LOGFILE=*/a RSYNC_PATTERN_FIRST=include' "$config_file" + fi + + if ! grep "RSYNC_INCLUDE_PATTERN=" "$config_file" > /dev/null; then + sed -i '/^RSYNC_EXCLUDE_PATTERN=*/a RSYNC_INCLUDE_PATTERN=""' "$config_file" + fi + + if ! grep "RSYNC_INCLUDE_FROM=" "$config_file" > /dev/null; then + sed -i '/^RSYNC_EXCLUDE_FROM=*/a RSYNC_INCLUDE_FROM=""' "$config_file" + fi + + if ! grep "PARTIAL=" "$config_file" > /dev/null; then + sed -i '/^FORCE_STRANGER_LOCK_RESUME=*/a PARTIAL=no' "$config_file" + fi + + if ! grep "DELTA_COPIES=" "$config_file" > /dev/null; then + sed -i '/^PARTIAL=*/a DELTA_COPIES=yes' "$config_file" + fi } _QUICKSYNC=0