diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2022-02-10 20:10:29 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2022-02-10 20:23:56 +0100 |
| commit | a36fc80aeb3f835fad02f443d65dc608b74b92d1 (patch) | |
| tree | 0fd6843c6407dc6220bb8e4bb3ae8a2f375ac372 /scripts | |
| parent | e35244455814a56d0f80af84e28d177a72a35168 (diff) | |
| parent | 3a52569499e2f0c4d1f25db1e81617a9d9755400 (diff) | |
| download | mariadb-git-a36fc80aeb3f835fad02f443d65dc608b74b92d1.tar.gz | |
Merge branch '10.2' into 10.3mariadb-10.3.34
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/wsrep_sst_mariabackup.sh | 5 | ||||
| -rw-r--r-- | scripts/wsrep_sst_mysqldump.sh | 5 | ||||
| -rw-r--r-- | scripts/wsrep_sst_rsync.sh | 6 |
3 files changed, 12 insertions, 4 deletions
diff --git a/scripts/wsrep_sst_mariabackup.sh b/scripts/wsrep_sst_mariabackup.sh index aa9442b0601..471b0e5f5b0 100644 --- a/scripts/wsrep_sst_mariabackup.sh +++ b/scripts/wsrep_sst_mariabackup.sh @@ -1,4 +1,7 @@ -#!/bin/bash -ue +#!/usr/bin/env bash + +set -ue + # Copyright (C) 2017-2021 MariaDB # Copyright (C) 2013 Percona Inc # diff --git a/scripts/wsrep_sst_mysqldump.sh b/scripts/wsrep_sst_mysqldump.sh index bed2cac0a9a..1c8fc181328 100644 --- a/scripts/wsrep_sst_mysqldump.sh +++ b/scripts/wsrep_sst_mysqldump.sh @@ -1,4 +1,7 @@ -#!/bin/bash -ue +#!/usr/bin/env bash + +set -ue + # Copyright (C) 2009-2015 Codership Oy # Copyright (C) 2017-2021 MariaDB # diff --git a/scripts/wsrep_sst_rsync.sh b/scripts/wsrep_sst_rsync.sh index 28dfed18218..cc73db5da87 100644 --- a/scripts/wsrep_sst_rsync.sh +++ b/scripts/wsrep_sst_rsync.sh @@ -1,4 +1,6 @@ -#!/bin/bash -ue +#!/usr/bin/env bash + +set -ue # Copyright (C) 2017-2021 MariaDB # Copyright (C) 2010-2014 Codership Oy @@ -740,7 +742,7 @@ EOF elif [ "$OS" = 'Linux' ]; then tmpfile=$(mktemp "--tmpdir=$tmpdir") else - tmpfile=$(TMPDIR="$tmpdir"; mktemp '-d') + tmpfile=$(TMPDIR="$tmpdir"; mktemp) fi wsrep_log_info "Extracting binlog files:" |