From 6b842b81c26dd5aee2f4c213835cfd4db2963e19 Mon Sep 17 00:00:00 2001 From: uselibrary Date: Tue, 14 Jun 2022 11:06:23 +0800 Subject: [PATCH] fix debian.sh bugs --- scripts/install/debian.sh | 7 ++++++- scripts/lib.sh | 6 +++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/scripts/install/debian.sh b/scripts/install/debian.sh index b3282ab5e..e8f1b9b9a 100644 --- a/scripts/install/debian.sh +++ b/scripts/install/debian.sh @@ -35,7 +35,12 @@ if [ -f /usr/sbin/ufw ];then fi -ufw disable +if [ -f /usr/sbin/ufw ];then + + ufw disable + +fi + if [ ! -f /usr/sbin/ufw ];then apt install -y firewalld diff --git a/scripts/lib.sh b/scripts/lib.sh index 4b64d76fd..14349bad6 100755 --- a/scripts/lib.sh +++ b/scripts/lib.sh @@ -297,8 +297,8 @@ if [ "$OSNAME" == "macos" ]; then elif [ "$OSNAME" == "ubuntu" ] || [ "$OSNAME" == "debian" ]; then - aptitude install -y libcurl4-gnutls-dev - apt-get install -y devscripts + apt install -y libcurl4-gnutls-dev + apt install -y devscripts apt install -y libffi-dev apt install -y cmake automake make @@ -335,7 +335,7 @@ elif [ "$OSNAME" == "ubuntu" ] || [ "$OSNAME" == "debian" ]; then apt install -y libmariadb-dev #apt install -y libmysqlclient-dev apt install -y libmariadb-dev-compat - apt install -y libmariadbclient-dev + #apt install -y libmariadbclient-dev else yum install -y openldap openldap-devel libtirpc libtirpc-devel rpcgen