build.sh脚本优化，解决npm 10+版本校验无法通过的问题-openGauss-workbench-AtomGit

已合并

build.sh脚本优化，解决npm 10+版本校验无法通过的问题 #593

段国强创建于 2024年2月18日从refs/pull/593/head 合入到 master

build.sh脚本优化，解决npm 10+版本校验无法通过的问题 #593

已合并

段国强创建于 2024年2月18日

从refs/pull/593/head合入到master

共 2 个文件变更+30-9

Mbuild.sh+26-8

	@@ -90,10 +90,16 @@ mkdir -p output/$plugin_doc_output
90		90
91	function prepare_java_env()	91	function prepare_java_env()
92	{	92	{
93	- echo "We no longer provide java, please makesure java(1.11*) already in PATH!"	93	+ echo "We no longer provide java, please makesure java(11+) already in PATH!"
94	JAVA_VERSION=`java -version 2>&1 \| awk -F '"' '/version/ {print $2}'`	94	JAVA_VERSION=`java -version 2>&1 \| awk -F '"' '/version/ {print $2}'`
		95	+ if [ -z "$JAVA_VERSION" ]; then
		96	+ echo "Failed to obtain java version!"
		97	+ exit 1
		98	+ fi
		99	+
95	echo java version is $JAVA_VERSION	100	echo java version is $JAVA_VERSION
96	- if [ x"$JAVA_VERSION" \< x"11" ]; then	101	+ MAJOR_VERSION=`echo $JAVA_VERSION \| awk -F '[.]' '{print $1}'`
		102	+ if [ $MAJOR_VERSION -lt 11 ]; then
97	echo "java version is not meeting requirements!"	103	echo "java version is not meeting requirements!"
98	exit 1	104	exit 1
99	fi	105	fi
	@@ -103,10 +109,16 @@ function prepare_maven_env()
103	{	109	{
104	echo "We no longer provide mvn, please makesure mvn(3.6.0+) already in PATH!"	110	echo "We no longer provide mvn, please makesure mvn(3.6.0+) already in PATH!"
105	MAVEN_VERSION=`mvn -v 2>&1 \| awk '/Apache Maven / {print $3}'`	111	MAVEN_VERSION=`mvn -v 2>&1 \| awk '/Apache Maven / {print $3}'`
		112	+ if [ -z "$MAVEN_VERSION" ]; then
		113	+ echo "Failed to obtain maven version!"
		114	+ exit 1
		115	+ fi
		116	+
106	echo maven version is $MAVEN_VERSION	117	echo maven version is $MAVEN_VERSION
107	- if [ x"$MAVEN_VERSION" \< x"3.6" ]; then	118	+ read MAJOR_VERSION MINOR_VERSION <<< $(echo $MAVEN_VERSION \| awk -F '[.]' '{print $1, $2}')
108	- echo "maven version is not meeting requirements!"	119	+ if [ $MAJOR_VERSION -lt 3 ] \|\| ([ $MAJOR_VERSION -eq 3 ] && [ $MINOR_VERSION -lt 6 ]); then
109	- exit 1	120	+ echo "maven version is not meeting requirements!"
		121	+ exit 1
110	fi	122	fi
111	}	123	}
112		124
	@@ -114,10 +126,16 @@ function prepare_npm_env()
114	{	126	{
115	echo "We no longer provide node/npm, please makesure npm(8.11.0+) already in PATH!"	127	echo "We no longer provide node/npm, please makesure npm(8.11.0+) already in PATH!"
116	NPM_VERSION=`npm -v 2>&1 \| awk -F '"' '// {print $1}'`	128	NPM_VERSION=`npm -v 2>&1 \| awk -F '"' '// {print $1}'`
		129	+ if [ -z "$NPM_VERSION" ]; then
		130	+ echo "Failed to obtain npm version!"
		131	+ exit 1
		132	+ fi
		133	+
117	echo npm version is $NPM_VERSION	134	echo npm version is $NPM_VERSION
118	- if [ x"$NPM_VERSION" \< x"8.11" ]; then	135	+ read MAJOR_VERSION MINOR_VERSION <<< $(echo $NPM_VERSION \| awk -F '[.]' '{print $1, $2}')
119	- echo "npm version is not meeting requirements!"	136	+ if [ $MAJOR_VERSION -lt 8 ] \|\| ([ $MAJOR_VERSION -eq 8 ] && [ $MINOR_VERSION -lt 11 ]); then
120	- exit 1	137	+ echo "npm version is not meeting requirements!"
		138	+ exit 1
121	fi	139	fi
122	}	140	}
123		141

MopenGauss-datakit/visualtool-common/src/main/java/org/opengauss/admin/common/constant/ops/SshCommandConstants.java+4-1

	@@ -89,7 +89,10 @@ public interface SshCommandConstants {
89		89
90	String LIMITS = "echo -e \"* hard nofile 1048576\\n* soft nproc 1048576\\n* hard nproc 1048576\\n* soft nproc 1048576\" >> /etc/security/limits.conf";	90	String LIMITS = "echo -e \"* hard nofile 1048576\\n* soft nproc 1048576\\n* hard nproc 1048576\\n* soft nproc 1048576\" >> /etc/security/limits.conf";
91		91
92	- String HOSTNAME = "cat /etc/hostname \| sed 's/\\\"//g'";	92	+ /**
		93	+ * hostname
		94	+ */
		95	+ String HOSTNAME = "hostname";
93	/**	96	/**
94	* decompress	97	* decompress
95	*/	98	*/