Merge pull request #899 from midoks/dev

常规更新

plugins/mtproxy/install.sh

@@ -25,14 +25,25 @@ sysName=$(uname | tr '[:upper:]' '[:lower:]')
 
 ARCH=amd64
 get_arch() {
-	echo "package main
+	# 使用 bash 来识别架构
-import (
+	local arch=$(uname -m)
-	\"fmt\"
+	case $arch in
-	\"runtime\"
+		x86_64|amd64)
-)
+			ARCH=amd64
-func main() { fmt.Println(runtime.GOARCH) }" > /tmp/go_arch.go
+			;;
-
+		aarch64|arm64)
-	ARCH=$(go run /tmp/go_arch.go)
+			ARCH=arm64
+			;;
+		armv7l|armv7)
+			ARCH=armv7
+			;;
+		i686|i386)
+			ARCH=386
+			;;
+		*)
+			ARCH=amd64
+			;;
+	esac
 	echo "ARCH:${ARCH}"
 }
 

scripts/install/alma.sh

@@ -23,6 +23,7 @@ yum install -y sshpass
 yum install -y libzstd-devel
 yum install -y postgresql-devel
 yum install -y brotli-devel
+yum install -y vim-common
 
 SSH_PORT=`netstat -ntpl|grep sshd|grep -v grep | sed -n "1,1p" | awk '{print $4}' | awk -F : '{print $2}'`
 if [ "$SSH_PORT" == "" ];then

scripts/install/amazon.sh

@@ -30,6 +30,7 @@ yum install -y numactl
 yum install -y sshpass
 yum install -y libzstd-devel
 yum install -y brotli-devel
+yum install -y vim-common
 
 SSH_PORT=`netstat -ntpl|grep sshd|grep -v grep | sed -n "1,1p" | awk '{print $4}' | awk -F : '{print $2}'`
 if [ "$SSH_PORT" == "" ];then

scripts/install/centos.sh

@@ -41,6 +41,7 @@ yum install -y sshpass
 yum install -y libzstd-devel
 yum install -y postgresql-devel
 yum install -y brotli-devel
+yum install -y vim-common
 
 # if [ -f /usr/sbin/iptables ];then
 

scripts/install/euler.sh

@@ -41,6 +41,7 @@ yum install -y sshpass
 yum install -y libzstd-devel
 yum install -y postgresql-devel
 yum install -y brotli-devel
+yum install -y vim-common
 
 
 # if [ -f /usr/sbin/iptables ];then

scripts/install/fedora.sh

@@ -21,6 +21,7 @@ yum install -y sshpass
 yum install -y libzstd-devel
 yum install -y postgresql-devel
 yum install -y brotli-devel
+yum install -y vim-common
 dnf install crontabs -y
 
 SSH_PORT=`netstat -ntpl|grep sshd|grep -v grep | sed -n "1,1p" | awk '{print $4}' | awk -F : '{print $2}'`

scripts/install/rhel.sh

@@ -47,6 +47,7 @@ $PKGMGR install -y sshpass
 $PKGMGR install -y libzstd-devel
 $PKGMGR install -y postgresql-devel
 $PKGMGR install -y brotli-devel
+$PKGMGR install -y vim-common
 
 echo "install remi source"
 if [ "$VERSION_ID" == "9" ];then

scripts/install/rocky.sh

@@ -31,6 +31,7 @@ yum install -y sshpass
 yum install -y libzstd-devel
 yum install -y postgresql-devel
 yum install -y brotli-devel
+yum install -y vim-common
 
 if [ -f /usr/sbin/iptables ];then