Merge branch 'master' into dev

Update install.sh
2026-11-04 19:16:00 +08:00 · 2026-11-04 14:47:28 +08:00 · 2026-11-04 14:43:26 +08:00 · 2026-11-04 14:43:07 +08:00 · 2026-11-04 14:40:26 +08:00 · 2026-11-04 12:43:49 +08:00
2 changed files with 5 additions and 3 deletions
--- a/plugins/manticoresearch/versions/apt/install.sh
+++ b/plugins/manticoresearch/versions/apt/install.sh
@@ -25,9 +25,10 @@ Install_App()

 	wget --no-check-certificate -O $MC_DIR/manticore-repo.noarch.deb https://repo.manticoresearch.com/manticore-repo.noarch.deb
 	dpkg -i $MC_DIR/manticore-repo.noarch.deb
-	apt update -y
-	apt -y upgrade manticore
+
 	apt -y install manticore manticore-extra
+	apt -y install manticore-extra
+	apt -y upgrade manticore

 	echo "${VERSION}" > $serverPath/manticoresearch/version.pl

--- a/plugins/manticoresearch/versions/yum/install.sh
+++ b/plugins/manticoresearch/versions/yum/install.sh
@@ -25,7 +25,8 @@ Install_App()
 	mkdir -p $MC_DIR

 	yum install -y https://repo.manticoresearch.com/manticore-repo.noarch.rpm
-	yum install -y manticore manticore-extra
+	yum install -y manticore
+	yum install -y manticore-extra

 	echo "${VERSION}" > $serverPath/manticoresearch/version.pl
Author	SHA1	Message	Date
dami	7d01a487dc	Merge branch 'master' into dev	2026-11-04 14:47:28 +08:00
dami	ba95ef1537	Update install.sh	2026-11-04 14:43:26 +08:00
dami	01035018c4	Update install.sh	2026-11-04 14:43:07 +08:00
dami	8aa12b979a	Update install.sh	2026-11-04 14:40:26 +08:00
Mr Chen	4c3d3bf41d	Merge pull request #963 from midoks/dev 常规优化	2026-11-04 12:43:49 +08:00
Mr Chen	f6bc08cec1	Merge pull request #962 from midoks/dev update	2026-11-04 00:47:06 +08:00
Mr Chen	6c2aa089f3	Merge pull request #961 from midoks/dev 常规优化	2026-11-04 00:06:02 +08:00