From 85941c82c6181ef785fea524edad2f65891e3f61 Mon Sep 17 00:00:00 2001
From: monlor <monlor@qq.com>
Date: Thu, 5 Mar 2020 21:17:07 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E5=96=84=E6=8F=92=E4=BB=B6=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E6=96=87=E4=BB=B6=EF=BC=8C=E4=BC=98=E5=8C=96applist?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/dms/config/mixbox.conf | 21 ---------------------
 apps/dms/scripts/config.sh  | 17 +++++++++++++++++
 apps/kms/config/mixbox.conf |  1 -
 apps/mixbox/bin/applist     | 17 ++++++++++++++++-
 apps/mixbox/bin/mixbox      | 15 ++++++++++++---
 5 files changed, 45 insertions(+), 26 deletions(-)
 delete mode 100644 apps/dms/config/mixbox.conf
 create mode 100644 apps/dms/scripts/config.sh

diff --git a/apps/dms/config/mixbox.conf b/apps/dms/config/mixbox.conf
deleted file mode 100644
index 134ccf7..0000000
--- a/apps/dms/config/mixbox.conf
+++ /dev/null
@@ -1,21 +0,0 @@
-#------------------【DMS】--------------------
-dms() {
-
-  eval `mbdb export dms`
-  source "$(mbdb get mixbox.main.path)"/bin/base
-  echo "********* $service ***********"
-  echo "[${appinfo}]"
-  readsh "启动${appname}服务[1/0] " "enable" "1"
-  if [ "$enable" == '1' ]; then
-      # Scripts Here
-      readsh "请输入${appname}媒体目录" "path" "${mbdisk}"
-      readsh "请输入${appname}媒体服务器名称" "servername" "mixbox-dms"
-      # readsh "请输入${appname}外网访问配置[1/0]" "openport" "0"
-      readsh "重启${appname}服务[1/0] " "res" "1"
-      [ "$res" = '1' -o -z "$res" ] && ${mbroot}/apps/${appname}/scripts/${appname}.sh restart
-  else
-      ${mbroot}/apps/${appname}/scripts/${appname}.sh stop
-  fi
-
-}
-#------------------【DMS】--------------------
diff --git a/apps/dms/scripts/config.sh b/apps/dms/scripts/config.sh
new file mode 100644
index 0000000..895932b
--- /dev/null
+++ b/apps/dms/scripts/config.sh
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+eval `mbdb export dms`
+source "$(mbdb get mixbox.main.path)"/bin/base
+echo "********* $service ***********"
+echo "[${appinfo}]"
+readsh "启动${appname}服务[1/0] " "enable" "1"
+if [ "$enable" == '1' ]; then
+    # Scripts Here
+    readsh "请输入${appname}媒体目录" "path" "${mbdisk}"
+    readsh "请输入${appname}媒体服务器名称" "servername" "mixbox-dms"
+    # readsh "请输入${appname}外网访问配置[1/0]" "openport" "0"
+    readsh "重启${appname}服务[1/0] " "res" "1"
+    [ "$res" = '1' -o -z "$res" ] && return 1
+else
+    return 0
+fi
\ No newline at end of file
diff --git a/apps/kms/config/mixbox.conf b/apps/kms/config/mixbox.conf
index 6c1cef4..e2ed885 100644
--- a/apps/kms/config/mixbox.conf
+++ b/apps/kms/config/mixbox.conf
@@ -3,7 +3,6 @@ kms() {
 
 	eval `mbdb export kms`
 	source /etc/mixbox/bin/base
-	source /etc/mixbox/bin/base
 	echo "********* $service ***********"
 	echo "[${appinfo}]"
 	readsh "启动${appname}服务[1/0] " "enable" "1"
diff --git a/apps/mixbox/bin/applist b/apps/mixbox/bin/applist
index 01d337b..8ddc0c8 100644
--- a/apps/mixbox/bin/applist
+++ b/apps/mixbox/bin/applist
@@ -67,9 +67,24 @@ get_applist() {
 }
 
 update_applist() {
+	
 	wgetsh ${mbtmp}/applist_tmp.txt $mburl/applist.txt
 	if [ $? -eq 0 ]; then
-		cat ${mbtmp}/applist_tmp.txt | grep "${model}" | sort -u > ${mbtmp}/applist.txt
+		rm -rf ${mbtmp}/applist.txt
+		cat ${mbtmp}/applist_tmp.txt | grep "${model}" | sort -u | while read line; do
+			local install_text=""
+			local update_text=""
+			local appname=""
+			local version=""
+			appname="$(echo -n "$line" | cut -d'|' -f1)"
+			version="$(echo -n "$line" | cut -d '|' -f4)"
+			if ls ${mbroot}/apps/${appname} &> /dev/null; then
+				[ "$(mbdb get ${appname}.main.version)" != "${version}" ] && update_text="有更新"
+			else
+				install_text="未安装"
+			fi
+			echo "${line}|${install_text}|${update_text}" >> ${mbtmp}/applist.txt
+		done
 	fi
 	rm -rf ${mbtmp}/applist_tmp.txt
 }
diff --git a/apps/mixbox/bin/mixbox b/apps/mixbox/bin/mixbox
index 0cbd00c..7d51ff1 100644
--- a/apps/mixbox/bin/mixbox
+++ b/apps/mixbox/bin/mixbox
@@ -335,9 +335,18 @@ select_app() {
 						read -p "是否要更新${appname}插件？[1/0] " update
 						[ "$update" == '1' ] && ${mbroot}/scripts/appmanage.sh upgrade ${appname} 
 					fi
-
-					source "${mbroot}"/apps/${appname}/config/mixbox.conf 
-					${appname}
+					# todo 配置方式修改
+					if [ -f ${mbroot}/apps/${appname}/config.sh ]; then
+						${mbroot}/apps/${appname}/config.sh
+						if [ $? -eq 0 ]; then
+							${mbroot}/apps/${appname}/scripts/${appname}.sh restart
+						else
+							${mbroot}/apps/${appname}/scripts/${appname}.sh stop
+						fi
+					else
+						source "${mbroot}"/apps/${appname}/config/mixbox.conf 
+						${appname}
+					fi
 					${mbroot}/apps/${appname}/scripts/${appname}.sh status
 				fi
 			else