fix(apply): better handling of external services config

This commit is contained in:
Jason Dreyzehner 2016-10-22 10:56:00 -04:00
parent fbe24eab78
commit 6e6f6b3da1
2 changed files with 6 additions and 3 deletions

View File

@ -140,9 +140,9 @@ On success, the Chrome extension will be located at: `browser-extensions/chrome/
To enable external services, set the `COPAY_EXTERNAL_SERVICES_CONFIG_LOCATION` or `BITPAY_EXTERNAL_SERVICES_CONFIG_LOCATION` environment variable to the location of your configuration before running the `apply` task. To enable external services, set the `COPAY_EXTERNAL_SERVICES_CONFIG_LOCATION` or `BITPAY_EXTERNAL_SERVICES_CONFIG_LOCATION` environment variable to the location of your configuration before running the `apply` task.
```sh ```sh
COPAY_EXTERNAL_SERVICES_CONFIG_LOCATION="~/.copay/externalServices.json" && npm run apply:copay COPAY_EXTERNAL_SERVICES_CONFIG_LOCATION="~/.copay/externalServices.json" npm run apply:copay
# or # or
BITPAY_EXTERNAL_SERVICES_CONFIG_LOCATION="~/.bitpay/externalServices.json" && npm run apply:bitpay BITPAY_EXTERNAL_SERVICES_CONFIG_LOCATION="~/.bitpay/externalServices.json" npm run apply:bitpay
``` ```
## About Copay ## About Copay

View File

@ -83,7 +83,7 @@ fs.writeFileSync('../appConfig.json', configBlob, 'utf8');
var externalServices; var externalServices;
try { try {
var confName = configDir.toUpperCase(); var confName = configDir.toUpperCase();
externalServicesConf = confName + '_EXTERNAL_SERVICES_CONFIG_LOCATION'; var externalServicesConf = confName + '_EXTERNAL_SERVICES_CONFIG_LOCATION';
console.log('Looking for ' + externalServicesConf + '...'); console.log('Looking for ' + externalServicesConf + '...');
if(typeof process.env[externalServicesConf] !== 'undefined') { if(typeof process.env[externalServicesConf] !== 'undefined') {
var location = process.env[externalServicesConf] var location = process.env[externalServicesConf]
@ -93,8 +93,11 @@ try {
console.log('Found at: ' + location); console.log('Found at: ' + location);
console.log('Copying ' + location + ' to root'); console.log('Copying ' + location + ' to root');
externalServices = fs.readFileSync(location, 'utf8'); externalServices = fs.readFileSync(location, 'utf8');
} else {
throw externalServicesConf + ' environment variable not set.';
} }
} catch(err) { } catch(err) {
console.log(err);
externalServices = '{}'; externalServices = '{}';
console.log('External services not configured'); console.log('External services not configured');
} }