up

scripts/install.sh

@@ -18,16 +18,6 @@ if [ "$EUID" -ne 0 ]
   exit
 fi
 
-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 [ ${_os} == "Darwin" ]; then
 	OSNAME='macos'

scripts/install/centos.sh

@@ -64,11 +64,9 @@ if [ ! -f /etc/init.d/iptables ];then
 
 	sed -i 's#AllowZoneDrifting=yes#AllowZoneDrifting=no#g' /etc/firewalld/firewalld.conf
 	firewall-cmd --reload
-fi
-
-
 	#安装时不开启
 	systemctl stop firewalld
+fi
 
 yum groupinstall -y "Development Tools"
 yum install -y epel-release

scripts/install/debian.sh

@@ -12,7 +12,7 @@ LANG=en_US.UTF-8
 # WHITE='\e[1;37m'  # 白色
 # NC='\e[0m' # 没有颜色
 
-if grep -Eq "Debian" /etc/*-release && [ ! -f /bin/sh ]; then
+if grep -Eq "Debian" /etc/*-release; then
     ln -sf /bin/bash /bin/sh
 fi
 

scripts/install/ubuntu.sh

@@ -3,7 +3,7 @@ PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin
 export PATH
 LANG=en_US.UTF-8
 
-if grep -Eq "Ubuntu" /etc/*-release && [ ! -f /bin/sh ]; then
+if grep -Eq "Ubuntu" /etc/*-release; then
     sudo ln -sf /bin/bash /bin/sh
     #sudo dpkg-reconfigure dash
 fi

scripts/install_cn.sh

@@ -18,15 +18,6 @@ if [ "$EUID" -ne 0 ]
   exit
 fi
 
-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 [ ${_os} == "Darwin" ]; then

scripts/install_dev.sh

@@ -18,16 +18,6 @@ if [ "$EUID" -ne 0 ]
   exit
 fi
 
-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 [ ${_os} == "Darwin" ]; then

scripts/update.sh

@@ -14,15 +14,6 @@ if [ "$EUID" -ne 0 ]
   exit
 fi
 
-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 [ ${_os} == "Darwin" ]; then
 	OSNAME='macos'

scripts/update/debian.sh

@@ -3,6 +3,11 @@ PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin
 export PATH
 LANG=en_US.UTF-8
 
+if grep -Eq "Ubuntu" /etc/*-release; then
+    sudo ln -sf /bin/bash /bin/sh
+    #sudo dpkg-reconfigure dash
+fi
+
 
 cd /www/server/mdserver-web/scripts && bash lib.sh
 chmod 755 /www/server/mdserver-web/data

scripts/update/ubuntu.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 "Ubuntu" /etc/*-release; then
+    sudo ln -sf /bin/bash /bin/sh
+    #sudo dpkg-reconfigure dash
+fi
 
 
 cd /www/server/mdserver-web/scripts && bash lib.sh

scripts/update_cn.sh

@@ -14,15 +14,6 @@ if [ "$EUID" -ne 0 ]
   exit
 fi
 
-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 [ ${_os} == "Darwin" ]; then

scripts/update_dev.sh

@@ -14,15 +14,6 @@ if [ "$EUID" -ne 0 ]
   exit
 fi
 
-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 [ ${_os} == "Darwin" ]; then
 	OSNAME='macos'