From 130cdd15a252147e58937676efceae8c64a5884c Mon Sep 17 00:00:00 2001 From: midoks Date: Mon, 4 Jul 2022 22:49:04 +0800 Subject: [PATCH] up --- scripts/install.sh | 6 +----- scripts/install/freebsd.sh | 4 ++++ scripts/install_cn.sh | 6 +----- scripts/install_dev.sh | 5 +---- scripts/update.sh | 6 +----- scripts/update_cn.sh | 5 +---- scripts/update_dev.sh | 6 +----- 7 files changed, 10 insertions(+), 28 deletions(-) diff --git a/scripts/install.sh b/scripts/install.sh index b81f727c7..2a0a751a6 100755 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -18,7 +18,7 @@ if [ "$EUID" -ne 0 ] exit fi -if grep -Eq "Ubuntu" /etc/*-release && [ ! -f /bin/sh ];; then +if grep -Eq "Ubuntu" /etc/*-release && [ ! -f /bin/sh ]; then sudo ln -sf /bin/bash /bin/sh #sudo dpkg-reconfigure dash fi @@ -27,10 +27,6 @@ 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 diff --git a/scripts/install/freebsd.sh b/scripts/install/freebsd.sh index 544b30903..175c81a31 100644 --- a/scripts/install/freebsd.sh +++ b/scripts/install/freebsd.sh @@ -3,6 +3,10 @@ PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin export PATH LANG=en_US.UTF-8 +if grep -Eq "FreeBSD" /etc/*-release && [ ! -f /bin/bash ]; then + ln -sf /usr/local/bin/bash /bin/bash +fi + pkg update -y pkg install -y python3 python3 -m ensurepip diff --git a/scripts/install_cn.sh b/scripts/install_cn.sh index 179578c69..d33c3784f 100755 --- a/scripts/install_cn.sh +++ b/scripts/install_cn.sh @@ -18,7 +18,7 @@ if [ "$EUID" -ne 0 ] exit fi -if grep -Eq "Ubuntu" /etc/*-release && [ ! -f /bin/sh ];; then +if grep -Eq "Ubuntu" /etc/*-release && [ ! -f /bin/sh ]; then sudo ln -sf /bin/bash /bin/sh #sudo dpkg-reconfigure dash fi @@ -27,10 +27,6 @@ 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 diff --git a/scripts/install_dev.sh b/scripts/install_dev.sh index bada653a4..55b90b224 100755 --- a/scripts/install_dev.sh +++ b/scripts/install_dev.sh @@ -18,7 +18,7 @@ if [ "$EUID" -ne 0 ] exit fi -if grep -Eq "Ubuntu" /etc/*-release && [ ! -f /bin/sh ];; then +if grep -Eq "Ubuntu" /etc/*-release && [ ! -f /bin/sh ]; then sudo ln -sf /bin/bash /bin/sh #sudo dpkg-reconfigure dash fi @@ -27,9 +27,6 @@ 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 diff --git a/scripts/update.sh b/scripts/update.sh index df4f2ddfc..dcf865fba 100755 --- a/scripts/update.sh +++ b/scripts/update.sh @@ -14,7 +14,7 @@ if [ "$EUID" -ne 0 ] exit fi -if grep -Eq "Ubuntu" /etc/*-release && [ ! -f /bin/sh ];; then +if grep -Eq "Ubuntu" /etc/*-release && [ ! -f /bin/sh ]; then sudo ln -sf /bin/bash /bin/sh #sudo dpkg-reconfigure dash fi @@ -23,10 +23,6 @@ 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/update_cn.sh b/scripts/update_cn.sh index 058cccd63..9924e2a97 100755 --- a/scripts/update_cn.sh +++ b/scripts/update_cn.sh @@ -14,7 +14,7 @@ if [ "$EUID" -ne 0 ] exit fi -if grep -Eq "Ubuntu" /etc/*-release && [ ! -f /bin/sh ];; then +if grep -Eq "Ubuntu" /etc/*-release && [ ! -f /bin/sh ]; then sudo ln -sf /bin/bash /bin/sh #sudo dpkg-reconfigure dash fi @@ -23,9 +23,6 @@ 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 diff --git a/scripts/update_dev.sh b/scripts/update_dev.sh index 94e8094a5..bcc83ca9e 100755 --- a/scripts/update_dev.sh +++ b/scripts/update_dev.sh @@ -14,7 +14,7 @@ if [ "$EUID" -ne 0 ] exit fi -if grep -Eq "Ubuntu" /etc/*-release && [ ! -f /bin/sh ];; then +if grep -Eq "Ubuntu" /etc/*-release && [ ! -f /bin/sh ]; then sudo ln -sf /bin/bash /bin/sh #sudo dpkg-reconfigure dash fi @@ -23,10 +23,6 @@ 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'