1
0
Fork 0

Merge remote-tracking branch 'origin/1.4' into devel

This commit is contained in:
Frank Celler 2013-11-06 23:35:52 +01:00
commit 44ccf72f6c
4 changed files with 4 additions and 4 deletions

View File

@ -26,7 +26,7 @@ start () {
test -d $PIDDIR || mkdir $PIDDIR
chown arangodb $PIDDIR
if [ "x$1" == "x--upgrade" ]; then
if [ "$1" = "--upgrade" ]; then
$DAEMON -c $CONF $@
else
$DAEMON -c $CONF --pid-file "$PIDFILE" --supervisor $@

View File

@ -29,7 +29,7 @@ start() {
ARANGO_PIDDIR=`dirname $pidfile`
test -d $ARANGO_PIDDIR || (mkdir $ARANGO_PIDDIR && chown arangodb $ARANGO_PIDDIR)
if [ "$1" == "--upgrade" ]; then
if [ "$1" = "--upgrade" ]; then
$ARANGO_BIN -c $ARANGO_SYSCONFIG $@
else
$ARANGO_BIN -c $ARANGO_SYSCONFIG --pid-file "$pidfile" --supervisor $@

View File

@ -47,7 +47,7 @@ start () {
ARANGO_PIDDIR=`dirname $ARANGO_PIDFILE`
test -d $ARANGO_PIDDIR || (mkdir $ARANGO_PIDDIR && chown arangodb $ARANGO_PIDDIR)
if [ "x$1" == "x--upgrade" ]; then
if [ "$1" = "--upgrade" ]; then
$ARANGO_BIN -c $ARANGO_SYSCONFIG $@
else
startproc $ARANGO_BIN -c $ARANGO_SYSCONFIG --pid-file "$ARANGO_PIDFILE" --supervisor $@

View File

@ -27,7 +27,7 @@ start () {
test -d $PIDDIR || mkdir $PIDDIR
chown arangodb $PIDDIR
if [ "x$1" == "x--upgrade" ]; then
if [ "$1" = "--upgrade" ]; then
$DAEMON -c $CONF $@
else
$DAEMON -c $CONF --pid-file "$PIDFILE" --supervisor $@