From ccb108e7e21199e3da5f1f973981ad4c6e16bb55 Mon Sep 17 00:00:00 2001 From: deajan Date: Thu, 11 Feb 2016 14:12:08 +0100 Subject: [PATCH] Improved upgrade script --- upgrade-v1.0x-v1.1x.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/upgrade-v1.0x-v1.1x.sh b/upgrade-v1.0x-v1.1x.sh index 3663c25..f79cc3c 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=2016020802 +PROGRAM_BUILD=2016021101 function Init { OSYNC_DIR=".osync_workdir" @@ -329,31 +329,31 @@ function RewriteConfigFiles { sed -i 's/^SYNC_ID=/INSTANCE_ID=/g' "$config_file" # Add new config file values from v1.1x - if ! grep "RSYNC_PATTERN_FIRST=" "$config_file" > /dev/null; then + 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 + 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 + if ! grep "^RSYNC_INCLUDE_FROM=" "$config_file" > /dev/null; then sed -i '/^RSYNC_EXCLUDE_FROM=*/a RSYNC_INCLUDE_FROM=""' "$config_file" fi - if ! grep "CHECKSUM=" "$config_file" > /dev/null; then + if ! grep "^CHECKSUM=" "$config_file" > /dev/null; then sed -i '/^PRESERVE_HARDLINKS=*/a CHECKSUM=no' "$config_file" fi - if ! grep "MAX_WAIT=" "$config_file" > /dev/null; then + if ! grep "^MAX_WAIT=" "$config_file" > /dev/null; then sed -i '/^MIN_WAIT=*/a MAX_WAIT=300' "$config_file" fi - if ! grep "PARTIAL=" "$config_file" > /dev/null; then + 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 + if ! grep "^DELTA_COPIES=" "$config_file" > /dev/null; then sed -i '/^PARTIAL=*/a DELTA_COPIES=yes' "$config_file" fi }