Browse Source

fix: archive

jonssonyan 2 years ago
parent
commit
f9119106f2

+ 4 - 6
archive/install_script_v2.1.5.sh

@@ -290,12 +290,10 @@ install_docker() {
     echo_content green "---> 安装Docker"
 
     # 关闭防火墙
-    if [[ "$(firewall-cmd --state 2>/dev/null)" == "running" ]]; then
-      if [[ "${release}" == "centos" ]]; then
-        systemctl disable firewalld
-      elif [[ "${release}" == "debian" || "${release}" == "ubuntu" ]]; then
-        sudo ufw disable
-      fi
+    if [[ "${release}" == "centos" ]]; then
+      systemctl disable firewalld
+    elif [[ "${release}" == "debian" || "${release}" == "ubuntu" ]]; then
+      sudo ufw disable
     fi
 
     # 时区

+ 4 - 6
archive/install_script_v2.1.6.sh

@@ -290,12 +290,10 @@ install_docker() {
     echo_content green "---> 安装Docker"
 
     # 关闭防火墙
-    if [[ "$(firewall-cmd --state 2>/dev/null)" == "running" ]]; then
-      if [[ "${release}" == "centos" ]]; then
-        systemctl disable firewalld
-      elif [[ "${release}" == "debian" || "${release}" == "ubuntu" ]]; then
-        sudo ufw disable
-      fi
+    if [[ "${release}" == "centos" ]]; then
+      systemctl disable firewalld
+    elif [[ "${release}" == "debian" || "${release}" == "ubuntu" ]]; then
+      sudo ufw disable
     fi
 
     # 时区

+ 4 - 6
archive/install_script_v2.1.7.sh

@@ -290,12 +290,10 @@ install_docker() {
     echo_content green "---> 安装Docker"
 
     # 关闭防火墙
-    if [[ "$(firewall-cmd --state 2>/dev/null)" == "running" ]]; then
-      if [[ "${release}" == "centos" ]]; then
-        systemctl disable firewalld
-      elif [[ "${release}" == "debian" || "${release}" == "ubuntu" ]]; then
-        sudo ufw disable
-      fi
+    if [[ "${release}" == "centos" ]]; then
+      systemctl disable firewalld
+    elif [[ "${release}" == "debian" || "${release}" == "ubuntu" ]]; then
+      sudo ufw disable
     fi
 
     # 时区

+ 4 - 6
archive/install_script_v2.1.8.sh

@@ -291,12 +291,10 @@ install_docker() {
     echo_content green "---> 安装Docker"
 
     # 关闭防火墙
-    if [[ "$(firewall-cmd --state 2>/dev/null)" == "running" ]]; then
-      if [[ "${release}" == "centos" ]]; then
-        systemctl disable firewalld
-      elif [[ "${release}" == "debian" || "${release}" == "ubuntu" ]]; then
-        sudo ufw disable
-      fi
+    if [[ "${release}" == "centos" ]]; then
+      systemctl disable firewalld
+    elif [[ "${release}" == "debian" || "${release}" == "ubuntu" ]]; then
+      sudo ufw disable
     fi
 
     # 时区

+ 4 - 6
archive/install_script_v2.2.0.sh

@@ -292,12 +292,10 @@ install_docker() {
     echo_content green "---> Install Docker"
 
     # turn off firewall
-    if [[ "$(firewall-cmd --state 2>/dev/null)" == "running" ]]; then
-      if [[ "${release}" == "centos" ]]; then
-        systemctl disable firewalld
-      elif [[ "${release}" == "debian" || "${release}" == "ubuntu" ]]; then
-        sudo ufw disable
-      fi
+    if [[ "${release}" == "centos" ]]; then
+      systemctl disable firewalld
+    elif [[ "${release}" == "debian" || "${release}" == "ubuntu" ]]; then
+      sudo ufw disable
     fi
 
     # set time zone

+ 4 - 6
archive/install_script_v2.2.1.sh

@@ -292,12 +292,10 @@ install_docker() {
     echo_content green "---> Install Docker"
 
     # turn off firewall
-    if [[ "$(firewall-cmd --state 2>/dev/null)" == "running" ]]; then
-      if [[ "${release}" == "centos" ]]; then
-        systemctl disable firewalld
-      elif [[ "${release}" == "debian" || "${release}" == "ubuntu" ]]; then
-        sudo ufw disable
-      fi
+    if [[ "${release}" == "centos" ]]; then
+      systemctl disable firewalld
+    elif [[ "${release}" == "debian" || "${release}" == "ubuntu" ]]; then
+      sudo ufw disable
     fi
 
     # set time zone

+ 4 - 6
install_script.sh

@@ -292,12 +292,10 @@ install_docker() {
     echo_content green "---> Install Docker"
 
     # turn off firewall
-    if [[ "$(firewall-cmd --state 2>/dev/null)" == "running" ]]; then
-      if [[ "${release}" == "centos" ]]; then
-        systemctl disable firewalld
-      elif [[ "${release}" == "debian" || "${release}" == "ubuntu" ]]; then
-        sudo ufw disable
-      fi
+    if [[ "${release}" == "centos" ]]; then
+      systemctl disable firewalld
+    elif [[ "${release}" == "debian" || "${release}" == "ubuntu" ]]; then
+      sudo ufw disable
     fi
 
     # set time zone