Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix XTERM option in scripts/startLocalCluster.sh

This commit is contained in:
Max Neunhoeffer 2017-01-19 16:12:58 +01:00
parent 1e77d6abca
commit 4e82f4ec12
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
scripts/startLocalCluster.sh
View File

@ -33,8 +33,12 @@ TRANSPORT="tcp"
LOG_LEVEL="INFO" LOG_LEVEL="INFO"
LOG_LEVEL_AGENCY="" LOG_LEVEL_AGENCY=""
LOG_LEVEL_CLUSTER="" LOG_LEVEL_CLUSTER=""
XTERM="x-terminal-emulator" if [ -z "$XTERM" ] ; then
XTERMOPTIONS="--geometry=80x43" XTERM="x-terminal-emulator"
fi
if [ -z "$XTERMOPTIONS" ] ; then
XTERMOPTIONS="--geometry=80x43"
fi
SECONDARIES=0 SECONDARIES=0
BUILD="build" BUILD="build"
JWT_SECRET="" JWT_SECRET=""
@ -248,7 +252,7 @@ startTerminal() {
PORT=$2 PORT=$2
mkdir cluster/data$PORT mkdir cluster/data$PORT
echo Starting $TYPE on port $PORT echo Starting $TYPE on port $PORT
$XTERM $XTERMOPTIONS -e ${BUILD}/bin/arangod \ $XTERM $XTERMOPTIONS -e "${BUILD}/bin/arangod \
-c none \ -c none \
--database.directory cluster/data$PORT \ --database.directory cluster/data$PORT \
--cluster.agency-endpoint $TRANSPORT://127.0.0.1:$BASE \ --cluster.agency-endpoint $TRANSPORT://127.0.0.1:$BASE \
@ -264,7 +268,7 @@ startTerminal() {
--javascript.app-path ./js/apps \ --javascript.app-path ./js/apps \
$AUTHENTICATION \ $AUTHENTICATION \
$SSLKEYFILE \ $SSLKEYFILE \
--console & --console" &
} }
startDebugger() { startDebugger() {
@ -293,7 +297,7 @@ startDebugger() {
--javascript.app-path ./js/apps \ --javascript.app-path ./js/apps \
$SSLKEYFILE \ $SSLKEYFILE \
$AUTHENTICATION & $AUTHENTICATION &
$XTERM $XTERMOPTIONS -e gdb ${BUILD}/bin/arangod -p $! & $XTERM $XTERMOPTIONS -e "gdb ${BUILD}/bin/arangod -p $!" &
} }
startRR() { startRR() {
@ -306,7 +310,7 @@ startRR() {
PORT=$2 PORT=$2
mkdir cluster/data$PORT mkdir cluster/data$PORT
echo Starting $TYPE on port $PORT with rr tracer echo Starting $TYPE on port $PORT with rr tracer
$XTERM $XTERMOPTIONS -e rr ${BUILD}/bin/arangod \ $XTERM $XTERMOPTIONS -e "rr ${BUILD}/bin/arangod \
-c none \ -c none \
--database.directory cluster/data$PORT \ --database.directory cluster/data$PORT \
--cluster.agency-endpoint $TRANSPORT://127.0.0.1:$BASE \ --cluster.agency-endpoint $TRANSPORT://127.0.0.1:$BASE \
@ -322,7 +326,7 @@ startRR() {
--javascript.app-path ./js/apps \ --javascript.app-path ./js/apps \
$AUTHENTICATION \ $AUTHENTICATION \
$SSLKEYFILE \ $SSLKEYFILE \
--console & --console" &
} }
PORTTOPDB=`expr 8629 + $NRDBSERVERS - 1` PORTTOPDB=`expr 8629 + $NRDBSERVERS - 1`