diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2017-11-10 01:38:03 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2017-11-10 01:38:03 +0100 |
| commit | 2a4e4335c4bcb7f7488c9b91bdc8a2da3da5cf61 (patch) | |
| tree | eadf9e2e8c0d2fccdd1db226395b8232b67737d6 /scripts | |
| parent | 7002291b8aa2e036a7adfd23d961dc09b4f01f46 (diff) | |
| parent | 9572bbdc3791178b82d4c71a8e3948a3a35123d4 (diff) | |
| download | mariadb-git-2a4e4335c4bcb7f7488c9b91bdc8a2da3da5cf61.tar.gz | |
Merge branch 'github/10.0-galera' into 10.1
Diffstat (limited to 'scripts')
| -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 723fd311f88..1ef4830661b 100644 --- a/scripts/wsrep_sst_common.sh +++ b/scripts/wsrep_sst_common.sh @@ -256,18 +256,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 } |