Merge pull request #3 from mapmeld/install-fixes

fix issues with fresh npm and from-source installs
This commit is contained in:
Jordi Baylina
2018-09-24 12:40:12 +02:00
committed by GitHub
2 changed files with 8 additions and 7 deletions

10
cli.js
View File

@@ -26,11 +26,11 @@ const path = require("path");
const compiler = require("./src/compiler"); const compiler = require("./src/compiler");
const version = require("./package").version;
const argv = require("yargs") const argv = require("yargs")
.version(function() { .version(version)
return require("./package").version; .usage("circom -s [input source circuit file] -o [output definition circuit file]")
})
.usage("jaz -s [input source circuit file] -o [output definition circuit file]")
.alias("s", "source") .alias("s", "source")
.alias("o", "output") .alias("o", "output")
.require(["s","o"]) .require(["s","o"])
@@ -40,7 +40,7 @@ const argv = require("yargs")
This program comes with ABSOLUTELY NO WARRANTY; This program comes with ABSOLUTELY NO WARRANTY;
This is free software, and you are welcome to redistribute it This is free software, and you are welcome to redistribute it
under certain conditions; see the COPYING file in the official under certain conditions; see the COPYING file in the official
repo directory at https://github.com/iden3/jaz `) repo directory at https://github.com/iden3/circom `)
.argv; .argv;
const fullFileName = path.resolve(process.cwd(), argv.source); const fullFileName = path.resolve(process.cwd(), argv.source);

View File

@@ -30,13 +30,14 @@
}, },
"dependencies": { "dependencies": {
"big-integer": "^1.6.32", "big-integer": "^1.6.32",
"optimist": "^0.6.1" "optimist": "^0.6.1",
"yargs": "^12.0.2"
}, },
"devDependencies": { "devDependencies": {
"chai": "^4.1.2", "chai": "^4.1.2",
"eslint": "^5.0.1", "eslint": "^5.0.1",
"eslint-plugin-mocha": "^5.0.0", "eslint-plugin-mocha": "^5.0.0",
"jison": "^0.4.18", "jison": "^0.4.18",
"zksnark": "0.0.6" "zksnark": "0.0.10"
} }
} }