diff --git a/scripts/install.sh b/scripts/install.sh index c90e56a46..b81f727c7 100755 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -18,15 +18,20 @@ if [ "$EUID" -ne 0 ] exit fi -if grep -Eq "Ubuntu" /etc/*-release; then - ln -sf /bin/bash /bin/sh - #sudo dpkg-reconfigure dash +if grep -Eq "Ubuntu" /etc/*-release && [ ! -f /bin/sh ];; then + sudo ln -sf /bin/bash /bin/sh + #sudo dpkg-reconfigure dash fi -if grep -Eq "Debian" /etc/*-release; then - ln -sf /bin/bash /bin/sh +if grep -Eq "Debian" /etc/*-release && [ ! -f /bin/sh ]; then + ln -sf /bin/bash /bin/sh fi +if grep -Eq "FreeBSD" /etc/*-release && [ ! -f /bin/bash ]; then + ln -sf /usr/local/bin/bash /bin/bash +fi + + if [ ${_os} == "Darwin" ]; then OSNAME='macos' diff --git a/scripts/install/freebsd.sh b/scripts/install/freebsd.sh index 4dda20fe0..8ee2e9c3a 100644 --- a/scripts/install/freebsd.sh +++ b/scripts/install/freebsd.sh @@ -15,10 +15,15 @@ pkg install -y py38-mysqlclient pkg install -y gcc pkg install -y autoconf -pkg install -y make cmake gmake +pkg install -y make +pkg install -y gmake +pkg install -y cmake pkg install -y libxslt pkg install -y libunwind +pkg install -y pcre +pkg install -y webp + pkg install -y mysql-devel diff --git a/scripts/install_cn.sh b/scripts/install_cn.sh index 9f5e43c26..179578c69 100755 --- a/scripts/install_cn.sh +++ b/scripts/install_cn.sh @@ -18,15 +18,20 @@ if [ "$EUID" -ne 0 ] exit fi -if grep -Eq "Ubuntu" /etc/*-release; then - ln -sf /bin/bash /bin/sh - #sudo dpkg-reconfigure dash +if grep -Eq "Ubuntu" /etc/*-release && [ ! -f /bin/sh ];; then + sudo ln -sf /bin/bash /bin/sh + #sudo dpkg-reconfigure dash fi -if grep -Eq "Debian" /etc/*-release; then - ln -sf /bin/bash /bin/sh +if grep -Eq "Debian" /etc/*-release && [ ! -f /bin/sh ]; then + ln -sf /bin/bash /bin/sh fi +if grep -Eq "FreeBSD" /etc/*-release && [ ! -f /bin/bash ]; then + ln -sf /usr/local/bin/bash /bin/bash +fi + + if [ ${_os} == "Darwin" ]; then OSNAME='macos' diff --git a/scripts/install_dev.sh b/scripts/install_dev.sh index 03c20fdcc..bada653a4 100755 --- a/scripts/install_dev.sh +++ b/scripts/install_dev.sh @@ -18,15 +18,20 @@ if [ "$EUID" -ne 0 ] exit fi -if grep -Eq "Ubuntu" /etc/*-release; then - ln -sf /bin/bash /bin/sh - #sudo dpkg-reconfigure dash +if grep -Eq "Ubuntu" /etc/*-release && [ ! -f /bin/sh ];; then + sudo ln -sf /bin/bash /bin/sh + #sudo dpkg-reconfigure dash fi -if grep -Eq "Debian" /etc/*-release; then - ln -sf /bin/bash /bin/sh +if grep -Eq "Debian" /etc/*-release && [ ! -f /bin/sh ]; then + ln -sf /bin/bash /bin/sh fi +if grep -Eq "FreeBSD" /etc/*-release && [ ! -f /bin/bash ]; then + ln -sf /usr/local/bin/bash /bin/bash +fi + + if [ ${_os} == "Darwin" ]; then OSNAME='macos' diff --git a/scripts/lib.sh b/scripts/lib.sh index 4ee55fda3..d3fa6f67d 100755 --- a/scripts/lib.sh +++ b/scripts/lib.sh @@ -222,11 +222,19 @@ echo -e "Install_Curl" >> ${libPath}/lib.pl } -if grep -Eq "Ubuntu" /etc/*-release; then +if grep -Eq "Ubuntu" /etc/*-release && [ ! -f /bin/sh ];; then sudo ln -sf /bin/bash /bin/sh #sudo dpkg-reconfigure dash fi +if grep -Eq "Debian" /etc/*-release && [ ! -f /bin/sh ]; then + ln -sf /bin/bash /bin/sh +fi + +if grep -Eq "FreeBSD" /etc/*-release && [ ! -f /bin/bash ]; then + ln -sf /usr/local/bin/bash /bin/bash +fi + _os=`uname` if [ ${_os} == "Darwin" ]; then OSNAME='macos' diff --git a/scripts/update.sh b/scripts/update.sh index d66942575..df4f2ddfc 100755 --- a/scripts/update.sh +++ b/scripts/update.sh @@ -14,15 +14,20 @@ if [ "$EUID" -ne 0 ] exit fi -if grep -Eq "Ubuntu" /etc/*-release; then - ln -sf /bin/bash /bin/sh - #sudo dpkg-reconfigure dash +if grep -Eq "Ubuntu" /etc/*-release && [ ! -f /bin/sh ];; then + sudo ln -sf /bin/bash /bin/sh + #sudo dpkg-reconfigure dash fi -if grep -Eq "Debian" /etc/*-release; then - ln -sf /bin/bash /bin/sh +if grep -Eq "Debian" /etc/*-release && [ ! -f /bin/sh ]; then + ln -sf /bin/bash /bin/sh fi +if grep -Eq "FreeBSD" /etc/*-release && [ ! -f /bin/bash ]; then + ln -sf /usr/local/bin/bash /bin/bash +fi + + if [ ${_os} == "Darwin" ]; then OSNAME='macos' elif grep -Eq "openSUSE" /etc/*-release; then diff --git a/scripts/update_cn.sh b/scripts/update_cn.sh index a76824af6..058cccd63 100755 --- a/scripts/update_cn.sh +++ b/scripts/update_cn.sh @@ -14,15 +14,20 @@ if [ "$EUID" -ne 0 ] exit fi -if grep -Eq "Ubuntu" /etc/*-release; then - ln -sf /bin/bash /bin/sh - #sudo dpkg-reconfigure dash +if grep -Eq "Ubuntu" /etc/*-release && [ ! -f /bin/sh ];; then + sudo ln -sf /bin/bash /bin/sh + #sudo dpkg-reconfigure dash fi -if grep -Eq "Debian" /etc/*-release; then - ln -sf /bin/bash /bin/sh +if grep -Eq "Debian" /etc/*-release && [ ! -f /bin/sh ]; then + ln -sf /bin/bash /bin/sh fi +if grep -Eq "FreeBSD" /etc/*-release && [ ! -f /bin/bash ]; then + ln -sf /usr/local/bin/bash /bin/bash +fi + + if [ ${_os} == "Darwin" ]; then OSNAME='macos' elif grep -Eq "openSUSE" /etc/*-release; then diff --git a/scripts/update_dev.sh b/scripts/update_dev.sh index 45f3de803..94e8094a5 100755 --- a/scripts/update_dev.sh +++ b/scripts/update_dev.sh @@ -14,15 +14,20 @@ if [ "$EUID" -ne 0 ] exit fi -if grep -Eq "Ubuntu" /etc/*-release; then - ln -sf /bin/bash /bin/sh - #sudo dpkg-reconfigure dash +if grep -Eq "Ubuntu" /etc/*-release && [ ! -f /bin/sh ];; then + sudo ln -sf /bin/bash /bin/sh + #sudo dpkg-reconfigure dash fi -if grep -Eq "Debian" /etc/*-release; then - ln -sf /bin/bash /bin/sh +if grep -Eq "Debian" /etc/*-release && [ ! -f /bin/sh ]; then + ln -sf /bin/bash /bin/sh fi +if grep -Eq "FreeBSD" /etc/*-release && [ ! -f /bin/bash ]; then + ln -sf /usr/local/bin/bash /bin/bash +fi + + if [ ${_os} == "Darwin" ]; then OSNAME='macos' elif grep -Eq "openSUSE" /etc/*-release; then