Browse Source

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.
pull/4195/head
Julius Goryavsky 2 months ago
parent
commit
03ae1f5ab3
  1. 6
      scripts/wsrep_sst_common.sh

6
scripts/wsrep_sst_common.sh

@ -24,9 +24,9 @@ trap 'exit 3' INT QUIT TERM
OS="$(uname)"
# Setting the paths for some utilities on CentOS
export PATH="${PATH:+$PATH:}/usr/local/bin:/usr/local/sbin:/usr/bin:/bin:/usr/sbin:/sbin"
if [ "$OS" != 'Darwin' ] && [ "$OS" != 'FreeBSD' ]; then
export LD_LIBRARY_PATH="${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}/usr/local/lib:/usr/lib:/lib:/opt/lib"
export PATH="${PATH:+$PATH:}/usr/local/bin:/usr/local/sbin:/bin:/sbin:/usr/bin:/usr/sbin"
if [ "$OS" != 'Darwin' ]; then
export LD_LIBRARY_PATH="${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}/usr/local/lib:/lib:/usr/lib:/opt/lib"
fi
commandex()

Loading…
Cancel
Save