Peter M. Groen / knowledgetree

Commit 413e6d1b469f6625903c69fd02d8b0e6582ca3cb

Authored by Megan Watson
1 parent e2cbb0a3

Removed :q. Added new path to office 

Committed by: Megan Watson
Inline Side-by-side
Showing 1 changed file with 8 additions and 9 deletions
dmsctl.sh
  View file @413e6d1
... ... @@ -2,7 +2,7 @@
2 2 # chkconfig: 2345 55 25
3 3 # description: KnowledgeTree Services
4 4 #
5   -# processname: ktdms
  5 +# processname: ktdms
6 6  
7 7 cd $(dirname $0)
8 8  
... ... @@ -29,7 +29,7 @@ SOFFICEFILE=soffice
29 29 SOFFICE_PIDFILE=$INSTALL_PATH/var/log/soffice.bin.pid
30 30 SOFFICE_PID=""
31 31 SOFFICE_PORT="8100"
32   -SOFFICEBIN=/usr/bin/soffice
  32 +SOFFICEBIN=/usr/share/ktdms-office/ktdms-office/openoffice/program/soffice
33 33 SOFFICE="$SOFFICEBIN -nofirststartwizard -nologo -headless -accept=socket,host=127.0.0.1,port=$SOFFICE_PORT;urp;StarOffice.ServiceManager"
34 34 SOFFICE_STATUS=""
35 35  
... ... @@ -38,7 +38,6 @@ LUCENE_PIDFILE=$INSTALL_PATH/var/log/lucene.pid
38 38 LUCENE_PID=""
39 39 LUCENE="$JAVABIN -Xms512M -Xmx512M -jar ktlucene.jar"
40 40 LUCENE_STATUS=""
41   -:q
42 41  
43 42 # Scheduler
44 43 SCHEDULER_PATH="$INSTALL_PATH/bin/"
... ... @@ -71,7 +70,7 @@ get_pid() {
71 70 get_soffice_pid() {
72 71 get_pid $SOFFICE_PIDFILE
73 72 if [ ! $PID ]; then
74   - return
  73 + return
75 74 fi
76 75 if [ $PID -gt 0 ]; then
77 76 SOFFICE_PID=$PID
... ... @@ -81,7 +80,7 @@ get_soffice_pid() {
81 80 get_lucene_pid() {
82 81 get_pid $LUCENE_PIDFILE
83 82 if [ ! $PID ]; then
84   - return
  83 + return
85 84 fi
86 85 if [ $PID -gt 0 ]; then
87 86 LUCENE_PID=$PID
... ... @@ -91,7 +90,7 @@ get_lucene_pid() {
91 90 get_scheduler_pid() {
92 91 get_pid $SCHEDULER_PIDFILE
93 92 if [ ! $PID ]; then
94   - return
  93 + return
95 94 fi
96 95 if [ $PID -gt 0 ]; then
97 96 SCHEDULER_PID=$PID
... ... @@ -101,7 +100,7 @@ get_scheduler_pid() {
101 100 get_mysql_pid() {
102 101 get_pid $MYSQL_PIDFILE
103 102 if [ ! $PID ]; then
104   - return
  103 + return
105 104 fi
106 105 if [ $PID -gt 0 ]; then
107 106 MYSQL_PID=$PID
... ... @@ -183,7 +182,7 @@ start_soffice() {
183 182 echo "$0 $ARG: openoffice could not be started"
184 183 ERROR=3
185 184 fi
186   - else
  185 + else
187 186 echo "$0 $ARG: path to openoffice binary ($SOFFICEBIN) could not be found"
188 187 ERROR=3
189 188 fi
... ... @@ -388,7 +387,7 @@ if [ ! -z ${2} ]; then
388 387 [ "${2}" != "mysql" ] && [ "${2}" != "apache" ] && [ "${2}" != "agent" ] && [ "${2}" != "scheduler" ] && [ "${2}" != "soffice" ] && [ "${2}" != "lucene" ] && noserver $2
389 388 SERVER=$2
390 389 fi
391   -
  390 +
392 391  
393 392 if [ "x$3" != "x" ]; then
394 393 MYSQL_PASSWORD=$3
... ...