Fixed string typo.
This commit is contained in:
parent
b4159c1b02
commit
f7d22fc549
|
@ -4,7 +4,7 @@ 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.1-pre
|
PROGRAM_VERSION=1.1-pre
|
||||||
PROGRAM_BUILD=2015112801
|
PROGRAM_BUILD=2015112802
|
||||||
IS_STABLE=no
|
IS_STABLE=no
|
||||||
|
|
||||||
FUNC_BUILD=2015111901
|
FUNC_BUILD=2015111901
|
||||||
|
@ -1184,18 +1184,18 @@ function RsyncPatternsFromAdd {
|
||||||
function RsyncPatterns {
|
function RsyncPatterns {
|
||||||
__CheckArguments 0 $# $FUNCNAME "$@" #__WITH_PARANOIA_DEBUG
|
__CheckArguments 0 $# $FUNCNAME "$@" #__WITH_PARANOIA_DEBUG
|
||||||
|
|
||||||
if [ "$RSYNC_PATTERN_ORDER" == "exclude" ]; then
|
if [ "$RSYNC_PATTERN_FIRST" == "exclude" ]; then
|
||||||
RsyncPatternsAdd "$RSYNC_EXCLUDE_PATTERN" "exclude"
|
RsyncPatternsAdd "$RSYNC_EXCLUDE_PATTERN" "exclude"
|
||||||
RsyncPatternsFromAdd "$RSYNC_EXCLUDE_FROM" "exclude"
|
RsyncPatternsFromAdd "$RSYNC_EXCLUDE_FROM" "exclude"
|
||||||
RsyncPatternsAdd "$RSYNC_INCLUDE_PATTERN" "include"
|
RsyncPatternsAdd "$RSYNC_INCLUDE_PATTERN" "include"
|
||||||
RsyncPatternsFromAdd "$RSYNC_INCLUDE_FROM" "include"
|
RsyncPatternsFromAdd "$RSYNC_INCLUDE_FROM" "include"
|
||||||
elif [ "$RSYNC_PATTERN_ORDER" == "include" ]; then
|
elif [ "$RSYNC_PATTERN_FIRST" == "include" ]; then
|
||||||
RsyncPatternsAdd "$RSYNC_INCLUDE_PATTERN" "include"
|
RsyncPatternsAdd "$RSYNC_INCLUDE_PATTERN" "include"
|
||||||
RsyncPatternsFromAdd "$RSYNC_EXCLUDE_FROM" "include"
|
RsyncPatternsFromAdd "$RSYNC_EXCLUDE_FROM" "include"
|
||||||
RsyncPatternsAdd "$RSYNC_EXCLUDE_PATTERN" "exclude"
|
RsyncPatternsAdd "$RSYNC_EXCLUDE_PATTERN" "exclude"
|
||||||
RsyncPatternsFromAdd "$RSYNC_EXCLUDE_FROM" "exclude"
|
RsyncPatternsFromAdd "$RSYNC_EXCLUDE_FROM" "exclude"
|
||||||
else
|
else
|
||||||
Logger "Bogus RSYNC_PATTERN_ORDER in config file" "WARN"
|
Logger "Bogus RSYNC_PATTERN_FIRST value in config file. Will not use rsync patterns." "WARN"
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -4,7 +4,7 @@ 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.1-pre
|
PROGRAM_VERSION=1.1-pre
|
||||||
PROGRAM_BUILD=2015112801
|
PROGRAM_BUILD=2015112802
|
||||||
IS_STABLE=no
|
IS_STABLE=no
|
||||||
|
|
||||||
source "./ofunctions.sh"
|
source "./ofunctions.sh"
|
||||||
|
@ -296,18 +296,18 @@ function RsyncPatternsFromAdd {
|
||||||
function RsyncPatterns {
|
function RsyncPatterns {
|
||||||
__CheckArguments 0 $# $FUNCNAME "$@" #__WITH_PARANOIA_DEBUG
|
__CheckArguments 0 $# $FUNCNAME "$@" #__WITH_PARANOIA_DEBUG
|
||||||
|
|
||||||
if [ "$RSYNC_PATTERN_ORDER" == "exclude" ]; then
|
if [ "$RSYNC_PATTERN_FIRST" == "exclude" ]; then
|
||||||
RsyncPatternsAdd "$RSYNC_EXCLUDE_PATTERN" "exclude"
|
RsyncPatternsAdd "$RSYNC_EXCLUDE_PATTERN" "exclude"
|
||||||
RsyncPatternsFromAdd "$RSYNC_EXCLUDE_FROM" "exclude"
|
RsyncPatternsFromAdd "$RSYNC_EXCLUDE_FROM" "exclude"
|
||||||
RsyncPatternsAdd "$RSYNC_INCLUDE_PATTERN" "include"
|
RsyncPatternsAdd "$RSYNC_INCLUDE_PATTERN" "include"
|
||||||
RsyncPatternsFromAdd "$RSYNC_INCLUDE_FROM" "include"
|
RsyncPatternsFromAdd "$RSYNC_INCLUDE_FROM" "include"
|
||||||
elif [ "$RSYNC_PATTERN_ORDER" == "include" ]; then
|
elif [ "$RSYNC_PATTERN_FIRST" == "include" ]; then
|
||||||
RsyncPatternsAdd "$RSYNC_INCLUDE_PATTERN" "include"
|
RsyncPatternsAdd "$RSYNC_INCLUDE_PATTERN" "include"
|
||||||
RsyncPatternsFromAdd "$RSYNC_EXCLUDE_FROM" "include"
|
RsyncPatternsFromAdd "$RSYNC_EXCLUDE_FROM" "include"
|
||||||
RsyncPatternsAdd "$RSYNC_EXCLUDE_PATTERN" "exclude"
|
RsyncPatternsAdd "$RSYNC_EXCLUDE_PATTERN" "exclude"
|
||||||
RsyncPatternsFromAdd "$RSYNC_EXCLUDE_FROM" "exclude"
|
RsyncPatternsFromAdd "$RSYNC_EXCLUDE_FROM" "exclude"
|
||||||
else
|
else
|
||||||
Logger "Bogus RSYNC_PATTERN_ORDER in config file" "WARN"
|
Logger "Bogus RSYNC_PATTERN_FIRST value in config file. Will not use rsync patterns." "WARN"
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
8
osync.sh
8
osync.sh
|
@ -4,7 +4,7 @@ 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.1-pre
|
PROGRAM_VERSION=1.1-pre
|
||||||
PROGRAM_BUILD=2015112801
|
PROGRAM_BUILD=2015112802
|
||||||
IS_STABLE=no
|
IS_STABLE=no
|
||||||
|
|
||||||
FUNC_BUILD=2015111901
|
FUNC_BUILD=2015111901
|
||||||
|
@ -1070,18 +1070,18 @@ function RsyncPatternsFromAdd {
|
||||||
|
|
||||||
function RsyncPatterns {
|
function RsyncPatterns {
|
||||||
|
|
||||||
if [ "$RSYNC_PATTERN_ORDER" == "exclude" ]; then
|
if [ "$RSYNC_PATTERN_FIRST" == "exclude" ]; then
|
||||||
RsyncPatternsAdd "$RSYNC_EXCLUDE_PATTERN" "exclude"
|
RsyncPatternsAdd "$RSYNC_EXCLUDE_PATTERN" "exclude"
|
||||||
RsyncPatternsFromAdd "$RSYNC_EXCLUDE_FROM" "exclude"
|
RsyncPatternsFromAdd "$RSYNC_EXCLUDE_FROM" "exclude"
|
||||||
RsyncPatternsAdd "$RSYNC_INCLUDE_PATTERN" "include"
|
RsyncPatternsAdd "$RSYNC_INCLUDE_PATTERN" "include"
|
||||||
RsyncPatternsFromAdd "$RSYNC_INCLUDE_FROM" "include"
|
RsyncPatternsFromAdd "$RSYNC_INCLUDE_FROM" "include"
|
||||||
elif [ "$RSYNC_PATTERN_ORDER" == "include" ]; then
|
elif [ "$RSYNC_PATTERN_FIRST" == "include" ]; then
|
||||||
RsyncPatternsAdd "$RSYNC_INCLUDE_PATTERN" "include"
|
RsyncPatternsAdd "$RSYNC_INCLUDE_PATTERN" "include"
|
||||||
RsyncPatternsFromAdd "$RSYNC_EXCLUDE_FROM" "include"
|
RsyncPatternsFromAdd "$RSYNC_EXCLUDE_FROM" "include"
|
||||||
RsyncPatternsAdd "$RSYNC_EXCLUDE_PATTERN" "exclude"
|
RsyncPatternsAdd "$RSYNC_EXCLUDE_PATTERN" "exclude"
|
||||||
RsyncPatternsFromAdd "$RSYNC_EXCLUDE_FROM" "exclude"
|
RsyncPatternsFromAdd "$RSYNC_EXCLUDE_FROM" "exclude"
|
||||||
else
|
else
|
||||||
Logger "Bogus RSYNC_PATTERN_ORDER in config file" "WARN"
|
Logger "Bogus RSYNC_PATTERN_FIRST value in config file. Will not use rsync patterns." "WARN"
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue