From 669259634a4118b5a3cee9aa3d689b89d741b19f Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 21 Jan 2019 15:05:56 +0800
Subject: [PATCH] update

---
 plugins/qbittorrent/install.sh | 19 ++++++++++---------
 plugins/sphinx/index.html      |  1 +
 plugins/sphinx/index.py        |  9 +++++++++
 plugins/sphinx/js/sphinx.js    |  6 ++++++
 4 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/plugins/qbittorrent/install.sh b/plugins/qbittorrent/install.sh
index 6a73f1a2e..008590c4d 100755
--- a/plugins/qbittorrent/install.sh
+++ b/plugins/qbittorrent/install.sh
@@ -30,27 +30,28 @@ Install_qbittorrent()
 	if [ ! -f ${QB_DIR}/libtorrent-rasterbar-1.1.9.tar.gz ];then
 		wget -O ${QB_DIR}/libtorrent-rasterbar-1.1.9.tar.gz https://github.com/arvidn/libtorrent/releases/download/libtorrent-1_1_9/libtorrent-rasterbar-1.1.9.tar.gz
 	fi
-	cd ${QB_DIR} tar -zxf libtorrent-rasterbar-1.1.9.tar.gz
+	cd ${QB_DIR} && tar -zxf libtorrent-rasterbar-1.1.9.tar.gz
 	cd ${QB_DIR} && cd libtorrent-rasterbar-1.1.9
 	
 	#修改为固定端口号
 	#sed -i "s/i2p ? 1 : tracker_req().listen_port/8999/" src/http_tracker_connection.cpp
 	./configure --prefix=$serverPath/lib/libtorrent CXXFLAGS=-std=c++11
 	make && make install
-	#echo "$serverPath/lib/libtorrent/lib" > /etc/ld.so.conf.d/libtorrent-x86_64.conf 
-	#ldconfig
-	#export LD_LIBRARY_PATH=/usr/local/libtorrent/lib/
-	#export CPLUS_INCLUDE_PATH=/usr/local/libtorrent/include/
-	#export PKG_CONFIG_PATH=/usr/local/libtorrent/lib/pkgconfig/
+	#echo "/www/server/lib/libtorrent/lib" > /etc/ld.so.conf.d/libtorrent-x86_64.conf
+	echo "$serverPath/lib/libtorrent/lib" > /etc/ld.so.conf.d/libtorrent-x86_64.conf
+	ldconfig
+	#export LD_LIBRARY_PATH=/www/server/lib/libtorrent/lib
+	#export CPLUS_INCLUDE_PATH=/www/server/lib/libtorrent/include/
+	export CPLUS_INCLUDE_PATH=$serverPath/lib/libtorrent/include/
+	export PKG_CONFIG_PATH=$serverPath/lib/libtorrent/lib/pkgconfig/
 
 
 	if [ ! -f ${QB_DIR}/qbittorrent-4.1.5.tar.gz ];then
 		wget -O ${QB_DIR}/qbittorrent-4.1.5.tar.gz https://github.com/qbittorrent/qBittorrent/archive/release-4.1.5.tar.gz
 	fi
 
-	cd ${QB_DIR} && tar -zxvf qbittorrent-4.1.5.tar.gz
-
-	#cp -rf ${SPHINX_DIR}/sphinx-3.1.1/ $serverPath/sphinx/bin
+	cd ${QB_DIR} && tar -zxvf qbittorrent-4.1.5.tar.gz && \
+	./configure --prefix=$serverPath/qbittorrent --disable-gui && make && make install
 
 	echo '4.1.5' > $serverPath/qbittorrent/version.pl
 	echo '安装完成' > $install_tmp
diff --git a/plugins/sphinx/index.html b/plugins/sphinx/index.html
index 5842b327b..806be0ced 100755
--- a/plugins/sphinx/index.html
+++ b/plugins/sphinx/index.html
@@ -8,6 +8,7 @@
 			<p onclick="pluginLogs('sphinx','','query_log', 30);">查询日志</p>
 			<p onclick="runStatus();">运行状态</p>
 			<p onclick="rebuild();">重建索引</p>
+			<p onclick="readme();">说明</p>
 		</div>
 		<div class="bt-w-con pd15">
 			<div class="soft-man-con"></div>
diff --git a/plugins/sphinx/index.py b/plugins/sphinx/index.py
index 466ed12e1..e4aa3bfd2 100755
--- a/plugins/sphinx/index.py
+++ b/plugins/sphinx/index.py
@@ -232,6 +232,13 @@ def runStatus():
 
     return public.returnJson(True, 'ok', rData)
 
+
+def sphinxCmd():
+    file = getConf()
+    content = public.readFile(file)
+    print content
+    return ''
+
 if __name__ == "__main__":
     func = sys.argv[1]
     if func == 'status':
@@ -260,5 +267,7 @@ if __name__ == "__main__":
         print queryLog()
     elif func == 'run_status':
         print runStatus()
+    elif func == 'sphinx_cmd':
+        print sphinxCmd()
     else:
         print 'error'
diff --git a/plugins/sphinx/js/sphinx.js b/plugins/sphinx/js/sphinx.js
index 8250ac131..5c64d94fd 100755
--- a/plugins/sphinx/js/sphinx.js
+++ b/plugins/sphinx/js/sphinx.js
@@ -81,3 +81,9 @@ function runStatus(){
     });
 }
 
+function readme(){
+    
+
+    $(".soft-man-con").html(Con);
+}
+