From 6bb2da4d1887f15ad526df5645318d11765d9720 Mon Sep 17 00:00:00 2001
From: Francis Chuang <francis.chuang@gmail.com>
Date: Mon, 27 May 2013 10:22:51 +1000
Subject: [PATCH 1/2] Use ArangoDB 1.3.1.

---
 tests/travis/setup_arangodb.sh | 126 ++++++++++++++++-----------------
 1 file changed, 63 insertions(+), 63 deletions(-)

diff --git a/tests/travis/setup_arangodb.sh b/tests/travis/setup_arangodb.sh
index fca8c10b..684c0164 100644
--- a/tests/travis/setup_arangodb.sh
+++ b/tests/travis/setup_arangodb.sh
@@ -1,64 +1,64 @@
-#!/bin/bash
-
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-cd $DIR
-
-VERSION=1.3.0
-NAME=ArangoDB-$VERSION
-
-if [ ! -d "$DIR/$NAME" ]; then
-  # download ArangoDB
-  echo "wget http://www.arangodb.org/travisCI/$NAME.tar.gz"
-  wget http://www.arangodb.org/travisCI/$NAME.tar.gz
-  echo "tar zxf $NAME.tar.gz"
-  tar zvxf $NAME.tar.gz
-fi
-
-ARCH=$(arch)
-PID=$(echo $PPID)
-TMP_DIR="/tmp/arangodb.$PID"
-PID_FILE="/tmp/arangodb.$PID.pid"
-ARANGODB_DIR="$DIR/$NAME"
-
-ARANGOD="${ARANGODB_DIR}/bin/arangod"
-if [ "$ARCH" == "x86_64" ]; then
-  ARANGOD="${ARANGOD}_x86_64"
-fi
-
-# create database directory
-mkdir ${TMP_DIR}
-
-echo "Starting arangodb '${ARANGOD}'"
-
-${ARANGOD} \
-    --database.directory ${TMP_DIR}  \
-    --configuration none  \
-    --server.endpoint tcp://127.0.0.1:8529 \
-    --javascript.startup-directory ${ARANGODB_DIR}/js \
-    --server.admin-directory ${ARANGODB_DIR}/html/admin \
-    --javascript.modules-path ${ARANGODB_DIR}/js/server/modules:${ARANGODB_DIR}/js/common/modules:${ARANGODB_DIR}/js/node \
-    --javascript.package-path ${ARANGODB_DIR}/js/npm:${ARANGODB_DIR}/js/common/test-data/modules \
-    --javascript.action-directory ${ARANGODB_DIR}/js/actions  \
-    --database.maximal-journal-size 1048576  \
-    --server.disable-admin-interface true \
-    --server.disable-authentication true \
-    --javascript.gc-interval 1 &
-
-sleep 2
-
-echo "Check for arangod process"
-process=$(ps auxww | grep "bin/arangod" | grep -v grep)
-
-if [ "x$process" == "x" ]; then
-  echo "no 'arangod' process found"
-  echo "ARCH = $ARCH"
-  exit 1
-fi
-
-echo "Waiting until ArangoDB is ready on port 8529"
-while [[ -z `curl -s 'http://127.0.0.1:8529/_api/version' ` ]] ; do
-  echo -n "."
-  sleep 2s
-done
-
+#!/bin/bash
+
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+cd $DIR
+
+VERSION=1.3.1
+NAME=ArangoDB-$VERSION
+
+if [ ! -d "$DIR/$NAME" ]; then
+  # download ArangoDB
+  echo "wget http://www.arangodb.org/travisCI/$NAME.tar.gz"
+  wget http://www.arangodb.org/travisCI/$NAME.tar.gz
+  echo "tar zxf $NAME.tar.gz"
+  tar zvxf $NAME.tar.gz
+fi
+
+ARCH=$(arch)
+PID=$(echo $PPID)
+TMP_DIR="/tmp/arangodb.$PID"
+PID_FILE="/tmp/arangodb.$PID.pid"
+ARANGODB_DIR="$DIR/$NAME"
+
+ARANGOD="${ARANGODB_DIR}/bin/arangod"
+if [ "$ARCH" == "x86_64" ]; then
+  ARANGOD="${ARANGOD}_x86_64"
+fi
+
+# create database directory
+mkdir ${TMP_DIR}
+
+echo "Starting arangodb '${ARANGOD}'"
+
+${ARANGOD} \
+    --database.directory ${TMP_DIR}  \
+    --configuration none  \
+    --server.endpoint tcp://127.0.0.1:8529 \
+    --javascript.startup-directory ${ARANGODB_DIR}/js \
+    --server.admin-directory ${ARANGODB_DIR}/html/admin \
+    --javascript.modules-path ${ARANGODB_DIR}/js/server/modules:${ARANGODB_DIR}/js/common/modules:${ARANGODB_DIR}/js/node \
+    --javascript.package-path ${ARANGODB_DIR}/js/npm:${ARANGODB_DIR}/js/common/test-data/modules \
+    --javascript.action-directory ${ARANGODB_DIR}/js/actions  \
+    --database.maximal-journal-size 1048576  \
+    --server.disable-admin-interface true \
+    --server.disable-authentication true \
+    --javascript.gc-interval 1 &
+
+sleep 2
+
+echo "Check for arangod process"
+process=$(ps auxww | grep "bin/arangod" | grep -v grep)
+
+if [ "x$process" == "x" ]; then
+  echo "no 'arangod' process found"
+  echo "ARCH = $ARCH"
+  exit 1
+fi
+
+echo "Waiting until ArangoDB is ready on port 8529"
+while [[ -z `curl -s 'http://127.0.0.1:8529/_api/version' ` ]] ; do
+  echo -n "."
+  sleep 2s
+done
+
 echo "ArangoDB is up"
\ No newline at end of file

From f62b131cdb948d7d3c457ae9cf233c2a0fc1c335 Mon Sep 17 00:00:00 2001
From: Francis Chuang <francis.chuang@gmail.com>
Date: Mon, 27 May 2013 10:24:15 +1000
Subject: [PATCH 2/2] Unix EOL.

---
 tests/travis/setup_arangodb.sh | 126 ++++++++++++++++-----------------
 1 file changed, 63 insertions(+), 63 deletions(-)

diff --git a/tests/travis/setup_arangodb.sh b/tests/travis/setup_arangodb.sh
index 684c0164..ddb9a2ae 100644
--- a/tests/travis/setup_arangodb.sh
+++ b/tests/travis/setup_arangodb.sh
@@ -1,64 +1,64 @@
-#!/bin/bash
-
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-cd $DIR
-
-VERSION=1.3.1
-NAME=ArangoDB-$VERSION
-
-if [ ! -d "$DIR/$NAME" ]; then
-  # download ArangoDB
-  echo "wget http://www.arangodb.org/travisCI/$NAME.tar.gz"
-  wget http://www.arangodb.org/travisCI/$NAME.tar.gz
-  echo "tar zxf $NAME.tar.gz"
-  tar zvxf $NAME.tar.gz
-fi
-
-ARCH=$(arch)
-PID=$(echo $PPID)
-TMP_DIR="/tmp/arangodb.$PID"
-PID_FILE="/tmp/arangodb.$PID.pid"
-ARANGODB_DIR="$DIR/$NAME"
-
-ARANGOD="${ARANGODB_DIR}/bin/arangod"
-if [ "$ARCH" == "x86_64" ]; then
-  ARANGOD="${ARANGOD}_x86_64"
-fi
-
-# create database directory
-mkdir ${TMP_DIR}
-
-echo "Starting arangodb '${ARANGOD}'"
-
-${ARANGOD} \
-    --database.directory ${TMP_DIR}  \
-    --configuration none  \
-    --server.endpoint tcp://127.0.0.1:8529 \
-    --javascript.startup-directory ${ARANGODB_DIR}/js \
-    --server.admin-directory ${ARANGODB_DIR}/html/admin \
-    --javascript.modules-path ${ARANGODB_DIR}/js/server/modules:${ARANGODB_DIR}/js/common/modules:${ARANGODB_DIR}/js/node \
-    --javascript.package-path ${ARANGODB_DIR}/js/npm:${ARANGODB_DIR}/js/common/test-data/modules \
-    --javascript.action-directory ${ARANGODB_DIR}/js/actions  \
-    --database.maximal-journal-size 1048576  \
-    --server.disable-admin-interface true \
-    --server.disable-authentication true \
-    --javascript.gc-interval 1 &
-
-sleep 2
-
-echo "Check for arangod process"
-process=$(ps auxww | grep "bin/arangod" | grep -v grep)
-
-if [ "x$process" == "x" ]; then
-  echo "no 'arangod' process found"
-  echo "ARCH = $ARCH"
-  exit 1
-fi
-
-echo "Waiting until ArangoDB is ready on port 8529"
-while [[ -z `curl -s 'http://127.0.0.1:8529/_api/version' ` ]] ; do
-  echo -n "."
-  sleep 2s
-done
-
+#!/bin/bash
+
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+cd $DIR
+
+VERSION=1.3.1
+NAME=ArangoDB-$VERSION
+
+if [ ! -d "$DIR/$NAME" ]; then
+  # download ArangoDB
+  echo "wget http://www.arangodb.org/travisCI/$NAME.tar.gz"
+  wget http://www.arangodb.org/travisCI/$NAME.tar.gz
+  echo "tar zxf $NAME.tar.gz"
+  tar zvxf $NAME.tar.gz
+fi
+
+ARCH=$(arch)
+PID=$(echo $PPID)
+TMP_DIR="/tmp/arangodb.$PID"
+PID_FILE="/tmp/arangodb.$PID.pid"
+ARANGODB_DIR="$DIR/$NAME"
+
+ARANGOD="${ARANGODB_DIR}/bin/arangod"
+if [ "$ARCH" == "x86_64" ]; then
+  ARANGOD="${ARANGOD}_x86_64"
+fi
+
+# create database directory
+mkdir ${TMP_DIR}
+
+echo "Starting arangodb '${ARANGOD}'"
+
+${ARANGOD} \
+    --database.directory ${TMP_DIR}  \
+    --configuration none  \
+    --server.endpoint tcp://127.0.0.1:8529 \
+    --javascript.startup-directory ${ARANGODB_DIR}/js \
+    --server.admin-directory ${ARANGODB_DIR}/html/admin \
+    --javascript.modules-path ${ARANGODB_DIR}/js/server/modules:${ARANGODB_DIR}/js/common/modules:${ARANGODB_DIR}/js/node \
+    --javascript.package-path ${ARANGODB_DIR}/js/npm:${ARANGODB_DIR}/js/common/test-data/modules \
+    --javascript.action-directory ${ARANGODB_DIR}/js/actions  \
+    --database.maximal-journal-size 1048576  \
+    --server.disable-admin-interface true \
+    --server.disable-authentication true \
+    --javascript.gc-interval 1 &
+
+sleep 2
+
+echo "Check for arangod process"
+process=$(ps auxww | grep "bin/arangod" | grep -v grep)
+
+if [ "x$process" == "x" ]; then
+  echo "no 'arangod' process found"
+  echo "ARCH = $ARCH"
+  exit 1
+fi
+
+echo "Waiting until ArangoDB is ready on port 8529"
+while [[ -z `curl -s 'http://127.0.0.1:8529/_api/version' ` ]] ; do
+  echo -n "."
+  sleep 2s
+done
+
 echo "ArangoDB is up"
\ No newline at end of file