anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

fix(apply): properly replace the ~ char in COPAY_EXTERNAL_SERVICES_CONFIG_LOCATION

Browse source
This commit is contained in:
Jason Dreyzehner 2016-10-21 12:30:02 -04:00
commit 2c34f53de4
2 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
app-template/apply.js
View file

@ -82,8 +82,13 @@ fs.writeFileSync('../appConfig.json', configBlob, 'utf8');
//////////////// ////////////////
var externalServices; var externalServices;
try { try {
console.log('Looking for COPAY_EXTERNAL_SERVICES_CONFIG_LOCATION...');
if(typeof process.env.COPAY_EXTERNAL_SERVICES_CONFIG_LOCATION !== 'undefined') { if(typeof process.env.COPAY_EXTERNAL_SERVICES_CONFIG_LOCATION !== 'undefined') {
var location = process.env.COPAY_EXTERNAL_SERVICES_CONFIG_LOCATION; var location = process.env.COPAY_EXTERNAL_SERVICES_CONFIG_LOCATION;
if(location.charAt(0) === '~') {
location = location.replace(/^\~/, os.homedir());
}
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');
} }

4
app-template/package-template.json
View file

@ -101,8 +101,8 @@
"run:android": "cordova run android --device", "run:android": "cordova run android --device",
"log:android": "adb logcat | grep chromium", "log:android": "adb logcat | grep chromium",
"sign:android": "rm -f platforms/android/build/outputs/apk/android-release-signed-aligned.apk; jarsigner -verbose -sigalg SHA1withRSA -digestalg SHA1 -keystore ../copay.keystore -signedjar platforms/android/build/outputs/apk/android-release-signed.apk platforms/android/build/outputs/apk/android-release-unsigned.apk copay_play && ../android-sdk-macosx/build-tools/21.1.1/zipalign -v 4 platforms/android/build/outputs/apk/android-release-signed.apk platforms/android/build/outputs/apk/android-release-signed-aligned.apk", "sign:android": "rm -f platforms/android/build/outputs/apk/android-release-signed-aligned.apk; jarsigner -verbose -sigalg SHA1withRSA -digestalg SHA1 -keystore ../copay.keystore -signedjar platforms/android/build/outputs/apk/android-release-signed.apk platforms/android/build/outputs/apk/android-release-unsigned.apk copay_play && ../android-sdk-macosx/build-tools/21.1.1/zipalign -v 4 platforms/android/build/outputs/apk/android-release-signed.apk platforms/android/build/outputs/apk/android-release-signed-aligned.apk",
"apply:copay": "cd app-template && node apply.js copay && cordova prepare", "apply:copay": "npm i && cd app-template && node apply.js copay && cordova prepare",
"apply:bitpay": "cd app-template && node apply.js bitpay && cordova prepare", "apply:bitpay": "npm i && cd app-template && node apply.js bitpay && cordova prepare",
"test": "./node_modules/.bin/grunt test-coveralls", "test": "./node_modules/.bin/grunt test-coveralls",
"clean": "trash platforms && trash plugins && cordova prepare", "clean": "trash platforms && trash plugins && cordova prepare",
"unstage-package": "git reset package.json", "unstage-package": "git reset package.json",