Skip to content

Commit 03ae1f5

Browse files
committed
Continuation of previous FreeBSD-related fix for Galera SST scripts
Paths are set to "canonical" form and historical practice where /lib comes before /usr/lib and /bin comes before /usr/bin. This eliminates the need to skip setting LD_LIBRARY_PATH for FreeBSD, which may help those users whose LD_LIBRARY_PATH is not configured properly.
1 parent b5d79b8 commit 03ae1f5

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

scripts/wsrep_sst_common.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ trap 'exit 3' INT QUIT TERM
2424
OS="$(uname)"
2525

2626
# Setting the paths for some utilities on CentOS
27-
export PATH="${PATH:+$PATH:}/usr/local/bin:/usr/local/sbin:/usr/bin:/bin:/usr/sbin:/sbin"
28-
if [ "$OS" != 'Darwin' ] && [ "$OS" != 'FreeBSD' ]; then
29-
export LD_LIBRARY_PATH="${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}/usr/local/lib:/usr/lib:/lib:/opt/lib"
27+
export PATH="${PATH:+$PATH:}/usr/local/bin:/usr/local/sbin:/bin:/sbin:/usr/bin:/usr/sbin"
28+
if [ "$OS" != 'Darwin' ]; then
29+
export LD_LIBRARY_PATH="${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}/usr/local/lib:/lib:/usr/lib:/opt/lib"
3030
fi
3131

3232
commandex()

0 commit comments

Comments
 (0)