From c9492cde2d6be294e66926494766e099c4fc7e2c Mon Sep 17 00:00:00 2001 From: Oliver Hamlet Date: Thu, 27 Aug 2015 15:47:01 +0100 Subject: [PATCH] Fix js script argument counting. --- scripts/archive.js | 14 +++++++------- scripts/vulcanize.js | 6 +++--- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/scripts/archive.js b/scripts/archive.js index 9ed1c670..49e0a946 100644 --- a/scripts/archive.js +++ b/scripts/archive.js @@ -7,13 +7,6 @@ var child_process = require('child_process'); var path = require('path'); var fs = require('fs-extra'); -if (process.argc < 3) { - var root_path = process.argv[2]; -} else { - var root_path = '.'; -} -var temp_path = path.join(root_path, 'build', 'archive.tmp'); - function vulcanize() { return child_process.execFileSync('node', [ 'scripts/vulcanize.js', @@ -162,6 +155,13 @@ function createApiArchive(dest_path) { fs.removeSync(temp_path); } +if (process.argv.length < 3) { + var root_path = '.'; +} else { + var root_path = process.argv[2]; +} +var temp_path = path.join(root_path, 'build', 'archive.tmp'); + var git_desc = getGitDescription(); vulcanize(); createAppArchive(path.join(root_path, 'build', 'LOOT ' + git_desc + '.7z')); diff --git a/scripts/vulcanize.js b/scripts/vulcanize.js index f7101cfa..36e73fda 100644 --- a/scripts/vulcanize.js +++ b/scripts/vulcanize.js @@ -5,10 +5,10 @@ var child_process = require('child_process'); var path = require('path'); var fs = require('fs'); -if (process.argc < 3) { - var root_path = process.argv[2]; -} else { +if (process.argv.length < 3) { var root_path = '.'; +} else { + var root_path = process.argv[2]; } var output_path = path.join(root_path, 'build', 'Release', 'resources', 'ui');