Merge pull request #12 from AquaQAnalytics/Crytpo_install

adding relevant paths for installation script

Author: SanderRoomus

appconfig/process.csv

@@ -1,20 +1,20 @@
 host,port,proctype,procname,U,localtime,g,T,w,load,startwithall,extras,qcmd
-localhost,{KDBBASEPORT}+1,discovery,discovery1,${TORQHOME}/appconfig/passwords/accesslist.txt,1,0,,,${KDBCODE}/processes/discovery.q,1,,q
-localhost,{KDBBASEPORT},tickerplant,tickerplant1,${TORQHOME}/appconfig/passwords/accesslist.txt,1,0,,,${KDBCODE}/processes/tickerplant.q,1,-schemafile ${TORQHOME}/database -tplogdir ${TORQHOME}/hdb,q
-localhost,{KDBBASEPORT}+2,rdb,rdb1,${TORQHOME}/appconfig/passwords/accesslist.txt,1,1,180,,${KDBCODE}/processes/rdb.q,1,-parentproctype cryptofunctions -P 17,q
-localhost,{KDBBASEPORT}+3,hdb,hdb1,${TORQHOME}/appconfig/passwords/accesslist.txt,1,1,60,4000,${KDBHDB},1,-parentproctype cryptofunctions,q
-localhost,{KDBBASEPORT}+4,hdb,hdb2,${TORQHOME}/appconfig/passwords/accesslist.txt,1,1,60,4000,${KDBHDB},1,-parentproctype cryptofunctions,q
-localhost,{KDBBASEPORT}+5,wdb,wdb1,${TORQHOME}/appconfig/passwords/accesslist.txt,1,1,,,${KDBCODE}/processes/wdb.q,1,,q
-localhost,{KDBBASEPORT}+6,sort,sort1,${TORQHOME}/appconfig/passwords/accesslist.txt,1,1,,,${KDBCODE}/processes/wdb.q,1,-s -2,q
-localhost,{KDBBASEPORT}+7,gateway,gateway1,${TORQHOME}/appconfig/passwords/accesslist.txt,1,1,,4000,${KDBCODE}/processes/gateway.q,1,,q
+localhost,{KDBBASEPORT}+1,discovery,discovery1,${TORQAPPHOME}/appconfig/passwords/accesslist.txt,1,0,,,${KDBCODE}/processes/discovery.q,1,,q
+localhost,{KDBBASEPORT},tickerplant,tickerplant1,${TORQAPPHOME}/appconfig/passwords/accesslist.txt,1,0,,,${KDBCODE}/processes/tickerplant.q,1,-schemafile ${TORQAPPHOME}/database -tplogdir ${TORQDATAHOME}/hdb,q
+localhost,{KDBBASEPORT}+2,rdb,rdb1,${TORQAPPHOME}/appconfig/passwords/accesslist.txt,1,1,180,,${KDBCODE}/processes/rdb.q,1,-parentproctype cryptofunctions -P 17,q
+localhost,{KDBBASEPORT}+3,hdb,hdb1,${TORQAPPHOME}/appconfig/passwords/accesslist.txt,1,1,60,4000,${KDBHDB},1,-parentproctype cryptofunctions,q
+localhost,{KDBBASEPORT}+4,hdb,hdb2,${TORQAPPHOME}/appconfig/passwords/accesslist.txt,1,1,60,4000,${KDBHDB},1,-parentproctype cryptofunctions,q
+localhost,{KDBBASEPORT}+5,wdb,wdb1,${TORQAPPHOME}/appconfig/passwords/accesslist.txt,1,1,,,${KDBCODE}/processes/wdb.q,1,,q
+localhost,{KDBBASEPORT}+6,sort,sort1,${TORQAPPHOME}/appconfig/passwords/accesslist.txt,1,1,,,${KDBCODE}/processes/wdb.q,1,-s -2,q
+localhost,{KDBBASEPORT}+7,gateway,gateway1,${TORQAPPHOME}/appconfig/passwords/accesslist.txt,1,1,,4000,${KDBCODE}/processes/gateway.q,1,,q
 localhost,{KDBBASEPORT}+9,monitor,monitor1,,1,0,,,${KDBCODE}/processes/monitor.q,1,,q
-localhost,{KDBBASEPORT}+10,housekeeping,housekeeping1,${TORQHOME}/appconfig/passwords/accesslist.txt,1,0,,,${KDBCODE}/processes/housekeeping.q,1,,q
-localhost,{KDBBASEPORT}+11,reporter,reporter1,${TORQHOME}/appconfig/passwords/accesslist.txt,1,0,,,${KDBCODE}/processes/reporter.q,1,,q
-localhost,{KDBBASEPORT}+12,chainedtp,chainedtp1,${TORQHOME}/appconfig/passwords/accesslist.txt,1,0,,,${KDBCODE}/processes/chainedtp.q,1,,q
+localhost,{KDBBASEPORT}+10,housekeeping,housekeeping1,${TORQAPPHOME}/appconfig/passwords/accesslist.txt,1,0,,,${KDBCODE}/processes/housekeeping.q,1,,q
+localhost,{KDBBASEPORT}+11,reporter,reporter1,${TORQAPPHOME}/appconfig/passwords/accesslist.txt,1,0,,,${KDBCODE}/processes/reporter.q,1,,q
+localhost,{KDBBASEPORT}+12,chainedtp,chainedtp1,${TORQAPPHOME}/appconfig/passwords/accesslist.txt,1,0,,,${KDBCODE}/processes/chainedtp.q,1,,q
 localhost,{KDBBASEPORT}+13,sortslave,sortslave1,,1,1,,,${KDBCODE}/processes/wdb.q,1,,q
 localhost,{KDBBASEPORT}+14,sortslave,sortslave2,,1,1,,,${KDBCODE}/processes/wdb.q,1,,q
-localhost,{KDBBASEPORT}+15,finexfeed,finexfeed1,,1,0,,,${KDBCODE}/processes/finexfeed.q,1,-parentproctype cryptofeed -P 17,q
-localhost,{KDBBASEPORT}+16,okexfeed,okexfeed1,,1,0,,,${KDBCODE}/processes/okexfeed.q,1,-parentproctype cryptofeed -P 17,q
-localhost,{KDBBASEPORT}+17,zbfeed,zbfeed1,,1,0,,,${KDBCODE}/processes/zbfeed.q,1,-parentproctype cryptofeed -P 17,q
-localhost,{KDBBASEPORT}+18,huobifeed,huobifeed1,,1,0,,,${KDBCODE}/processes/huobifeed.q,1,-parentproctype cryptofeed -P 17,q
-localhost,{KDBBASEPORT}+19,bhexfeed,bhexfeed1,,1,0,,,${KDBCODE}/processes/bhexfeed.q,1,-parentproctype cryptofeed -P 17,q
+localhost,{KDBBASEPORT}+15,finexfeed,finexfeed1,,1,0,,,${KDBAPPCODE}/processes/finexfeed.q,1,-parentproctype cryptofeed -P 17,q
+localhost,{KDBBASEPORT}+16,okexfeed,okexfeed1,,1,0,,,${KDBAPPCODE}/processes/okexfeed.q,1,-parentproctype cryptofeed -P 17,q
+localhost,{KDBBASEPORT}+17,zbfeed,zbfeed1,,1,0,,,${KDBAPPCODE}/processes/zbfeed.q,1,-parentproctype cryptofeed -P 17,q
+localhost,{KDBBASEPORT}+18,huobifeed,huobifeed1,,1,0,,,${KDBAPPCODE}/processes/huobifeed.q,1,-parentproctype cryptofeed -P 17,q
+localhost,{KDBBASEPORT}+19,bhexfeed,bhexfeed1,,1,0,,,${KDBAPPCODE}/processes/bhexfeed.q,1,-parentproctype cryptofeed -P 17,q

setenv.sh

@@ -11,21 +11,23 @@ else
 fi
 
 export TORQHOME=${dirpath}
+export TORQAPPHOME=${TORQHOME}
+export TORQDATAHOME=${TORQHOME}
 export KDBCONFIG=${TORQHOME}/config
 export KDBCODE=${TORQHOME}/code
-export KDBLOG=${TORQHOME}/logs
+export KDBLOG=${TORQDATAHOME}/logs
 export KDBHTML=${TORQHOME}/html
 export KDBLIB=${TORQHOME}/lib
-export KDBHDB=${TORQHOME}/hdb/database
-export KDBWDB=${TORQHOME}/wdbhdb
+export KDBHDB=${TORQDATAHOME}/hdb/database
+export KDBWDB=${TORQDATAHOME}/wdbhdb
 
 # set rlwrap and qcon paths for use in torq.sh qcon flag functions
 export RLWRAP="rlwrap"
 export QCON="qcon"
 
 # set the application specific configuration directory
-export KDBAPPCONFIG=${TORQHOME}/appconfig
-export KDBAPPCODE=${TORQHOME}/code
+export KDBAPPCONFIG=${TORQAPPHOME}/appconfig
+export KDBAPPCODE=${TORQAPPHOME}/code
 # set KDBBASEPORT to the default value for a TorQ Installation
 export KDBBASEPORT=9000
 # set TORQPROCESSES to the default process csv