diff --git a/app-template/apply.js b/app-template/apply.js index 106bfc998..9f5a5625a 100755 --- a/app-template/apply.js +++ b/app-template/apply.js @@ -82,8 +82,13 @@ fs.writeFileSync('../appConfig.json', configBlob, 'utf8'); //////////////// var externalServices; try { + console.log('Looking for COPAY_EXTERNAL_SERVICES_CONFIG_LOCATION...'); if(typeof process.env.COPAY_EXTERNAL_SERVICES_CONFIG_LOCATION !== 'undefined') { 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'); externalServices = fs.readFileSync(location, 'utf8'); } diff --git a/app-template/package-template.json b/app-template/package-template.json index 6fb7b14f4..5ff4ab91e 100644 --- a/app-template/package-template.json +++ b/app-template/package-template.json @@ -101,8 +101,8 @@ "run:android": "cordova run android --device", "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", - "apply:copay": "cd app-template && node apply.js copay && cordova prepare", - "apply:bitpay": "cd app-template && node apply.js bitpay && cordova prepare", + "apply:copay": "npm i && cd app-template && node apply.js copay && cordova prepare", + "apply:bitpay": "npm i && cd app-template && node apply.js bitpay && cordova prepare", "test": "./node_modules/.bin/grunt test-coveralls", "clean": "trash platforms && trash plugins && cordova prepare", "unstage-package": "git reset package.json",