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

Fix script

This commit is contained in:
Andreas Streichardt 2016-04-11 10:56:56 +02:00
parent 39c1070993
commit f791bbf9aa
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
utils/generateExamples.js
View File

@ -32,14 +32,8 @@ const scriptArguments = {
let ARANGOD; let ARANGOD;
let ARANGOSH; let ARANGOSH;
if (fs.exists("bin")) { ARANGOD = fs.join(fs.join(fs.makeAbsolute('')), "build/bin/arangod");
ARANGOD = fs.join(fs.join(fs.makeAbsolute('')), "bin/arangod"); ARANGOSH = fs.join(fs.join(fs.makeAbsolute('')), "build/bin/arangosh");
ARANGOSH = fs.join(fs.join(fs.makeAbsolute('')), "bin/arangosh");
}
else {
ARANGOD = fs.join(fs.join(fs.makeAbsolute('')), "build/bin/arangod");
ARANGOSH = fs.join(fs.join(fs.makeAbsolute('')), "build/bin/arangosh");
}
function endpointToURL(endpoint) { function endpointToURL(endpoint) {
if (endpoint.substr(0, 6) === "ssl://") { if (endpoint.substr(0, 6) === "ssl://") {
@ -69,7 +63,8 @@ function findFreePort() {
} }
function main(argv) { function main(argv) {
let thePython = 'python'; let CMakeCache = fs.readFileSync('build/CMakeCache.txt');
let thePython = CMakeCache.toString().match(/^PYTHON_EXECUTABLE:FILEPATH=(.*)$/m)[1];
let options = {}; let options = {};
let serverEndpoint = ''; let serverEndpoint = '';
let startServer = true; let startServer = true;
@ -135,7 +130,7 @@ function main(argv) {
print("================================================================================"); print("================================================================================");
print(toArgv(serverArgs)); print(toArgv(serverArgs));
instanceInfo.pid = executeExternal(ARANGOD, toArgv(serverArgs)); instanceInfo.pid = executeExternal(ARANGOD, toArgv(serverArgs)).pid;
// Wait until the server is up: // Wait until the server is up:
count = 0; count = 0;