arnaucube
arnaucube/circomPublic Self-hosted repository
Merge pull request #3 from mapmeld/install-fixes

fix issues with fresh npm and from-source installs
Jordi Baylina jordi@baylina.cat
Mon, 24 Sep 2018 12:40:12 +0200
commit

a0e13e9fce6353336cf306e78ea4ce5a693c8442

parent

431a6919630f82ed007c4fda4ff5ffb23d6c4d2c

2 files changed, 8 insertions(+), 7 deletions(-)

jump to
M cli.js → cli.js

@@ -26,11 +26,11 @@ const path = require("path");

const compiler = require("./src/compiler"); +const version = require("./package").version; + const argv = require("yargs") - .version(function() { - return require("./package").version; - }) - .usage("jaz -s [input source circuit file] -o [output definition circuit file]") + .version(version) + .usage("circom -s [input source circuit file] -o [output definition circuit file]") .alias("s", "source") .alias("o", "output") .require(["s","o"])

@@ -40,7 +40,7 @@ .epilogue(`Copyright (C) 2018 0kims association

This program comes with ABSOLUTELY NO WARRANTY; This is free software, and you are welcome to redistribute it 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; const fullFileName = path.resolve(process.cwd(), argv.source);
M package.json → package.json

@@ -30,13 +30,14 @@ "url": "git+https://github.com/iden3/jaz.git"

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