From 08ff82f91fbbb3629612e021223059a76b076860 Mon Sep 17 00:00:00 2001
From: wyy <wuyanyi09@gmail.com>
Date: Sat, 23 Nov 2013 07:40:18 -0800
Subject: [PATCH] testing

---
 CMakeLists.txt                             | 1 +
 conf/CMakeLists.txt                        | 1 +
 conf/{cppjieba_server.conf => server.conf} | 0
 scripts/CMakeLists.txt                     | 4 ++--
 scripts/restart.sh                         | 7 -------
 scripts/start.sh                           | 2 +-
 scripts/stop.sh                            | 2 +-
 test/curl.sh                               | 1 +
 8 files changed, 7 insertions(+), 11 deletions(-)
 create mode 100644 conf/CMakeLists.txt
 rename conf/{cppjieba_server.conf => server.conf} (100%)
 delete mode 100755 scripts/restart.sh
 create mode 100755 test/curl.sh

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 40dbf78..2e00c1a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,3 +4,4 @@ ADD_DEFINITIONS(-std=c++0x -O3)
 ADD_SUBDIRECTORY(src)
 ADD_SUBDIRECTORY(dicts)
 ADD_SUBDIRECTORY(scripts)
+ADD_SUBDIRECTORY(conf)
diff --git a/conf/CMakeLists.txt b/conf/CMakeLists.txt
new file mode 100644
index 0000000..e344c76
--- /dev/null
+++ b/conf/CMakeLists.txt
@@ -0,0 +1 @@
+INSTALL(FILES server.conf DESTINATION /etc/CppJieba)
diff --git a/conf/cppjieba_server.conf b/conf/server.conf
similarity index 100%
rename from conf/cppjieba_server.conf
rename to conf/server.conf
diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
index 845f58a..54a2f8e 100644
--- a/scripts/CMakeLists.txt
+++ b/scripts/CMakeLists.txt
@@ -1,2 +1,2 @@
-INSTALL(FILES start.sh stop.sh restart.sh DESTINATION /etc/init.d/CppJieba)
-INSTALL(FILES cjseg.sh stop.sh restart.sh DESTINATION bin)
+INSTALL(PROGRAMS start.sh stop.sh DESTINATION /etc/init.d/CppJieba)
+INSTALL(PROGRAMS cjseg.sh DESTINATION bin)
diff --git a/scripts/restart.sh b/scripts/restart.sh
deleted file mode 100755
index 0ef7154..0000000
--- a/scripts/restart.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-echo "stop ..."
-sh stop.sh
-echo "start ..."
-sh start.sh
-
diff --git a/scripts/start.sh b/scripts/start.sh
index 96f0598..950f094 100755
--- a/scripts/start.sh
+++ b/scripts/start.sh
@@ -1,2 +1,2 @@
 #!/bin/sh
-cjserver -n 4 -p 11258 -k start >> run.log 2>&1 &
+cjserver -c /etc/CppJieba/server.conf -k start >> /dev/null 2>&1 
diff --git a/scripts/stop.sh b/scripts/stop.sh
index ec4f59a..3237ffa 100755
--- a/scripts/stop.sh
+++ b/scripts/stop.sh
@@ -1,2 +1,2 @@
 #!/bin/sh
-./server.demo -n 4 -p 11258 -k stop
+cjserver -c /etc/CppJieba/server.conf -k stop
diff --git a/test/curl.sh b/test/curl.sh
new file mode 100755
index 0000000..52bfbf8
--- /dev/null
+++ b/test/curl.sh
@@ -0,0 +1 @@
+curl "http://127.0.0.1:11200/?key=南京市长江大桥"