Skip to content
Permalink
Browse files
MDEV-27737 Wsrep SST scripts not working on FreeBSD
- Changed SST scripts to use /usr/bin/env bash instead of
  /bin/bash for better portability.
- Fixed use of mktemp on non-Linux platforms to produce
  temporary file instead of directory.

Reviewed-by: Jan Lindström <jan.lindstrom@mariadb.com>
  • Loading branch information
temeo authored and Jan Lindström committed Feb 8, 2022
1 parent 5c89386 commit 21413ae
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 4 deletions.
@@ -1,4 +1,7 @@
#!/bin/bash -ue
#!/usr/bin/env bash

set -ue

# Copyright (C) 2017-2021 MariaDB
# Copyright (C) 2013 Percona Inc
#
@@ -1,4 +1,7 @@
#!/bin/bash -ue
#!/usr/bin/env bash

set -ue

# Copyright (C) 2009-2015 Codership Oy
# Copyright (C) 2017-2021 MariaDB
#
@@ -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:"

0 comments on commit 21413ae

Please sign in to comment.