diff options
| author | Jan Lindström <jan.lindstrom@mariadb.com> | 2017-10-04 07:59:25 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-04 07:59:25 +0300 |
| commit | bb62a0ad99afdd434d88607aab90b48c5235f844 (patch) | |
| tree | fb91395bfa9a5f4ade04c1798150f126bed0dbcc | |
| parent | eba0120d8f01399007441f839032f36ed178084f (diff) | |
| parent | 98e09ee4b624ded618124986fa0c04ef85e08cc0 (diff) | |
| download | mariadb-git-bb62a0ad99afdd434d88607aab90b48c5235f844.tar.gz | |
Merge pull request #458 from darkain/patch-1
MDEV-13909 Fix wsrep_sst_rsync fails on debian
| -rw-r--r-- | scripts/wsrep_sst_common.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/wsrep_sst_common.sh b/scripts/wsrep_sst_common.sh index 6906bcbc315..15632bf3683 100644 --- a/scripts/wsrep_sst_common.sh +++ b/scripts/wsrep_sst_common.sh @@ -244,18 +244,18 @@ parse_cnf() # finally get the variable value (if variables has been specified multiple time use the last value only) # look in group+suffix - if [[ -n $WSREP_SST_OPT_CONF_SUFFIX ]]; then + if [ -n $WSREP_SST_OPT_CONF_SUFFIX ]; then reval=$($MY_PRINT_DEFAULTS -c $WSREP_SST_OPT_CONF "${group}${WSREP_SST_OPT_CONF_SUFFIX}" | awk -F= '{if ($1 ~ /_/) { gsub(/_/,"-",$1); print $1"="$2 } else { print $0 }}' | grep -- "--$var=" | cut -d= -f2- | tail -1) fi # look in group - if [[ -z $reval ]]; then + if [ -z $reval ]; then reval=$($MY_PRINT_DEFAULTS -c $WSREP_SST_OPT_CONF $group | awk -F= '{if ($1 ~ /_/) { gsub(/_/,"-",$1); print $1"="$2 } else { print $0 }}' | grep -- "--$var=" | cut -d= -f2- | tail -1) fi # use default if we haven't found a value - if [[ -z $reval ]]; then - [[ -n $3 ]] && reval=$3 + if [ -z $reval ]; then + [ -n $3 ] && reval=$3 fi echo $reval } |