From c02e38106e3acbf00599b3ac18f48ef109b884c2 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Fri, 2 Nov 2018 13:38:20 +0800
Subject: [PATCH] u

---
 plugins/csvn/install.sh | 41 ++++++++++++++++++++++++-----------------
 route/plugins.py        |  2 +-
 task.py                 |  8 +++++---
 3 files changed, 30 insertions(+), 21 deletions(-)

diff --git a/plugins/csvn/install.sh b/plugins/csvn/install.sh
index d49ea93ce..3c25607e5 100755
--- a/plugins/csvn/install.sh
+++ b/plugins/csvn/install.sh
@@ -1,27 +1,34 @@
 #!/bin/bash
 PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin
 export PATH
-install_tmp='/tmp/bt_install.pl'
 
 
-wget -O csvn.tar.xz https://github.com/midoks/mdserver-web/releases/download/init/CollabNetSubversionEdge-5.1.4_linux-x86_64.tar.xz
 
-useradd csvn
+
+
+install_tmp='/tmp/bt_install.pl'
+
+echo "Install_csvn"
+#wget -O csvn.tar.xz https://github.com/midoks/mdserver-web/releases/download/init/CollabNetSubversionEdge-5.1.4_linux-x86_64.tar.xz
+#useradd csvn
 
 Install_csvn()
 {
-	mkdir -p /www/server/panel/plugin/safelogin
-	echo '正在安装脚本文件...' > $install_tmp
-	wget -O /www/server/panel/plugin/safelogin/safelogin_main.py $download_Url/install/lib/plugin/safelogin/safelogin_main.py -T 5
-	wget -O /www/server/panel/plugin/safelogin/index.html $download_Url/install/lib/plugin/safelogin/index.html -T 5
-	wget -O /www/server/panel/plugin/safelogin/info.json $download_Url/install/lib/plugin/safelogin/info.json -T 5
-	wget -O /www/server/panel/plugin/safelogin/icon.png $download_Url/install/lib/plugin/safelogin/icon.png -T 5
-	echo '安装完成' > $install_tmp
+
+	echo "ddd"
+	# mkdir -p /www/server/panel/plugin/safelogin
+	# echo '正在安装脚本文件...' > $install_tmp
+	# wget -O /www/server/panel/plugin/safelogin/safelogin_main.py $download_Url/install/lib/plugin/safelogin/safelogin_main.py -T 5
+	# wget -O /www/server/panel/plugin/safelogin/index.html $download_Url/install/lib/plugin/safelogin/index.html -T 5
+	# wget -O /www/server/panel/plugin/safelogin/info.json $download_Url/install/lib/plugin/safelogin/info.json -T 5
+	# wget -O /www/server/panel/plugin/safelogin/icon.png $download_Url/install/lib/plugin/safelogin/icon.png -T 5
+	# echo '安装完成' > $install_tmp
 	
 }
 
 Uninstall_csvn()
 {
+	echo "Uninstall_csvn"
 	# chattr -i /www/server/panel/plugin/safelogin/token.pl
 	# rm -f /www/server/panel/data/limitip.conf
 	# sed -i "/ALL/d" /etc/hosts.deny
@@ -29,10 +36,10 @@ Uninstall_csvn()
 }
 
 
-action=$1
-host=$2;
-if [ "${1}" == 'install' ];then
-	Install_safelogin
-else
-	Uninstall_safelogin
-fi
+# action=$1
+# host=$2;
+# if [ "${1}" == 'install' ];then
+# 	Install_safelogin
+# else
+# 	Uninstall_safelogin
+# fi
diff --git a/route/plugins.py b/route/plugins.py
index f9d5e5c2c..c1205cb7e 100644
--- a/route/plugins.py
+++ b/route/plugins.py
@@ -93,7 +93,7 @@ def install():
 
     pluginInfo = json.loads(public.readFile(infoJsonPos))
 
-    execstr = "cd /www/server/mdserver-web/plugins/" + \
+    execstr = "cd " + os.getcwd() + "/plugins/" + \
         name + " && /bin/bash " + pluginInfo["install"]
 
     taskAdd = (None, mmsg + '[' + name + '-' + "1" + ']',
diff --git a/task.py b/task.py
index 0018f23dd..5f8eed67a 100755
--- a/task.py
+++ b/task.py
@@ -43,6 +43,7 @@ class MyBad():
 
 
 def ExecShell(cmdstring, cwd=None, timeout=None, shell=True):
+    print cmdstring
     try:
         global logPath
         import shlex
@@ -103,17 +104,18 @@ def WriteLogs(logMsg):
 def startTask():
     # 任务队列
     global isTask
-    print isTask
+    print os.path.exists(isTask)
     try:
         while True:
             try:
                 if os.path.exists(isTask):
+                    print "run --- !"
                     sql = db.Sql()
                     sql.table('tasks').where(
                         "status=?", ('-1',)).setField('status', '0')
                     taskArr = sql.table('tasks').where("status=?", ('0',)).field(
                         'id,type,execstr').order("id asc").select()
-                    print tasksArr
+                    print sql
                     for value in taskArr:
                         start = int(time.time())
                         if not sql.table('tasks').where("id=?", (value['id'],)).count():
@@ -132,7 +134,7 @@ def startTask():
                         #     os.system('rm -f ' + isTask)
             except:
                 pass
-            siteEdate()
+            # siteEdate()
             # mainSafe()
             time.sleep(2)
     except: