status-im/status-dev-cli
1
0
Fork 0
mirror of https://github.com/status-im/status-dev-cli.git synced 2026-08-31 05:21:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change order of logic

Browse Source 
Changed the way the `if` statement that looks at the package.json and the options passed in by the start script so that it gives precedence to the options set in `scripts/start`. 

Also added in the option to override the name, seeing as specifying the name in the `package.json` is severely limited by the need to have no spaces or capitalized letters.
This commit is contained in:
Andy Tudhope
2017-12-24 11:38:30 +02:00
committed by GitHub
parent f3e5f45ea0
commit e77ade9b85
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cli.js
+6 -5
View File
@@ -69,11 +69,11 @@ function getCurrentPackageData() {
var obj = {};
if (fs.existsSync(process.cwd() + '/package.json')) {
var json = JSON.parse(fs.readFileSync(process.cwd() + '/package.json', 'utf8'));
obj["name"] = json.name;
obj["whisper-identity"] = "dapp-" + fromAscii(json.name);
obj["dapp-url"] = json["dapp-url"] || cli.dappUrl;
obj["bot-url"] = json["bot-url"] || cli.botUrl;
obj["photo-path"] = json["photo-path"] || cli.photoPath;
obj["name"] = cli.name || json.name;
obj["whisper-identity"] = cli.whisperIdentity || "dapp-" + fromAscii(json.name) ;
obj["dapp-url"] = cli.dappUrl || json["dapp-url"];
obj["bot-url"] = cli.botUrl || json["bot-url"];
obj["photo-path"] = cli.photoPath || json["photo-path"];
}
return obj;
}
@@ -312,6 +312,7 @@ cli.on("*", function(command) {
cli.version(pkgJson.version)
.option("--ip [ip]", "IP address of your device")
.option("--name [name]", "Name overrides package.json seeing as spaces and caps aren't available there")
.option("--dappUrl [url]", "Custom DApp URL (overrides the one from the package.json)")
.option("--botUrl [url]", "Custom bot URL (overrides the one from the package.json)")
.option("--photoPath [url]", "Custom photo for DApp (overrides the one from the package.json)")