diff --git a/plugins/csvn/info.json b/plugins/csvn/info.json index 87d8b127f..ad4503f8c 100755 --- a/plugins/csvn/info.json +++ b/plugins/csvn/info.json @@ -4,16 +4,12 @@ "shell": "install.sh", "name": "csvn", "title": "CSVN", - "default": false, - "versions":[ - {"status":false,"version":"1.0"} - ], + "versions": ["5.1"], "tip": "soft", - "checks": "/www/server/php/VERSION/bin/php", - "display": 1, - "author": "Zend", + "checks": "server/csvn/VERSION/", + "author": "midoks", "date": "2017-04-01", "home": "https://www.collab.net", - "type": "语言解释器", + "type": "SVN代码共享管理软件", "pid": "3" } \ No newline at end of file diff --git a/plugins/csvn/install.sh b/plugins/csvn/install.sh index d5f960018..f4aaf47b1 100755 --- a/plugins/csvn/install.sh +++ b/plugins/csvn/install.sh @@ -2,46 +2,39 @@ PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin export PATH +curPath=`pwd` +rootPath=$(dirname "$curPath") +rootPath=$(dirname "$rootPath") +serverPath=$(dirname "$rootPath") - - - -install_tmp='/tmp/bt_install.pl' - -echo "Install_csvn" - -#sleep 100 -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=${rootPath}/tmp/bt_install.pl Install_csvn() { + mkdir -p $serverPath/tmp + + echo '正在安装脚本文件...' > $install_tmp + wget -O $serverPath/tmp/csvn.tar.xz https://github.com/midoks/mdserver-web/releases/download/init/CollabNetSubversionEdge-5.1.4_linux-x86_64.tar.xz - 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 + cd $serverPath/tmp && tar -Jxf $serverPath/tmp/csvn.tar.xz + mkdir -p $serverPath/csvn + mv $serverPath/tmp/csvn $serverPath/csvn/5.1 + echo '安装完成' > $install_tmp + + rm -rf $serverPath/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 - # rm -rf /www/server/panel/plugin/safelogin + rm -rf $serverPath/csvn } -# action=$1 -# host=$2; -# if [ "${1}" == 'install' ];then -# Install_safelogin -# else -# Uninstall_safelogin -# fi +action=$1 +host=$2 +if [ "${1}" == 'install' ];then + Install_csvn +else + Uninstall_csvn +fi diff --git a/plugins/mysql/info.json b/plugins/mysql/info.json index b121a9250..6f22edb01 100755 --- a/plugins/mysql/info.json +++ b/plugins/mysql/info.json @@ -1,12 +1,10 @@ { - "title":"MySQL 5.5", - "tip":"lib", + "title":"MySQL", + "tip":"soft", "name":"mysql", "type":"运行环境", "ps":"MySQL是一种关系数据库管理系统!", - "versions":[ - {"status":false,"version":"1.0","task": "1"} - ], + "versions":["5.5"], "shell":"install.sh", "checks":"/www/server/panel/plugin/safelogin", "author":"midoks", diff --git a/plugins/nginx/info.json b/plugins/nginx/info.json index 5bba3e280..0134d45ce 100755 --- a/plugins/nginx/info.json +++ b/plugins/nginx/info.json @@ -5,21 +5,11 @@ "type":"其他插件", "ps":"轻量级,占有内存少,并发能力强", "shell":"install.sh", - "checks":"/www/server/panel/plugin/nginx", + "checks":"server/nginx", "author":"伊戈尔·赛索耶夫", "home":"https://www.nginx.org", - "path": "/www/server/nginx", + "path": "server/nginx", "date":"2017-11-24", - "default":true, - "display":1, "pid": "1", - "update": ["1.14.0", "1.12.2", "1.8.1", "1.15.3", "-Tengine2.2.2", "openresty"], - "versions": [ - {"status": false, "version": "1.14", "run": false, "no": "", "task": "1"}, - {"status": false, "version": "1.12", "run": false, "no": "", "task": "1"}, - {"status": false, "version": "1.8", "run": false, "no": "", "task": "1"}, - {"status": false, "version": "1.15", "run": false, "no": "", "task": "1"}, - {"status": false, "version": "-Tengine2.2", "run": false, "no": "", "task": "1"}, - {"status": false, "version": "openresty", "run": false, "no": "", "task": "1"} - ] + "versions": ["1.14.0", "1.12.2", "1.8.1", "1.15.3", "-Tengine2.2.2", "openresty"] } \ No newline at end of file diff --git a/plugins/nginx/install.sh b/plugins/nginx/install.sh index cc96cefbf..6ba43256c 100755 --- a/plugins/nginx/install.sh +++ b/plugins/nginx/install.sh @@ -2,12 +2,12 @@ PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin export PATH -Install_safelogin() +Install_nginx() { echo "Install_safelogin" } -Uninstall_safelogin() +Uninstall_nginx() { echo "Uninstall_safelogin" } @@ -15,7 +15,7 @@ Uninstall_safelogin() action=$1 host=$2; if [ "${1}" == 'install' ];then - Install_safelogin + Install_nginx else - Uninstall_safelogin + Uninstall_nginx fi diff --git a/route/plugins.py b/route/plugins.py index 6b83ce2ea..36ab7d604 100644 --- a/route/plugins.py +++ b/route/plugins.py @@ -40,8 +40,6 @@ def file(): @plugins.route("/list", methods=['GET', 'POST']) def list(): - # public.M('tasks') - data = json.loads(public.readFile("data/type.json")) ret = {} ret["type"] = data diff --git a/static/js/soft.js b/static/js/soft.js index 028946321..5c7f01057 100755 --- a/static/js/soft.js +++ b/static/js/soft.js @@ -1794,14 +1794,12 @@ function GetSList(isdisplay) { var checked = ''; checked = rdata.data[i].display ? 'checked' : ''; - // console.log(rdata.data[0]); - + if (typeof rdata.data[i].versions == "string"){ version_info += rdata.data[i].versions + '|'; } else { for (var j = 0; j < len; j++) { - if (rdata.data[i].versions[j].status) continue; - version_info += rdata.data[i].versions[j].version + '|'; + version_info += rdata.data[i].versions[j] + '|'; } } if (version_info != '') {