From acee3024a9ce0c0bf8bf0f7f1da2431b755ec103 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Dominguez Date: Thu, 16 Aug 2018 17:51:08 +0900 Subject: [PATCH 1/6] Quick fix for asn1 --- app-template/package-template.json | 2 +- fix-asn1.sh | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100755 fix-asn1.sh diff --git a/app-template/package-template.json b/app-template/package-template.json index 0aa5da5dc..dd714d43f 100644 --- a/app-template/package-template.json +++ b/app-template/package-template.json @@ -122,7 +122,7 @@ "sign:android": "rm -f platforms/android/build/outputs/apk/android-release-signed-aligned.apk; jarsigner -verbose -sigalg SHA1withRSA -digestalg SHA1 -keystore ../bitcoin-com-release-key.jks -signedjar platforms/android/build/outputs/apk/android-release-signed.apk platforms/android/build/outputs/apk/android-release-unsigned.apk bitcoin-com && zipalign -v 4 platforms/android/build/outputs/apk/android-release-signed.apk platforms/android/build/outputs/apk/android-release-signed-aligned.apk", "apply:copay": "npm i fs-extra && cd app-template && node apply.js copay && npm i && cordova prepare", "apply:bitpay": "npm i fs-extra && cd app-template && node apply.js bitpay && npm i && cordova prepare", - "apply:bitcoincom": "npm i fs-extra && cd app-template && node apply.js bitcoincom && npm i && cordova prepare", + "apply:bitcoincom": "npm i fs-extra && cd app-template && node apply.js bitcoincom && npm i && cordova prepare && cd ../ && ./fix-asn1.sh", "test": "karma start test/karma.conf.js --single-run", "clean": "trash platforms && trash plugins && cordova prepare", "unstage-package": "git reset package.json", diff --git a/fix-asn1.sh b/fix-asn1.sh new file mode 100755 index 000000000..40c847b3f --- /dev/null +++ b/fix-asn1.sh @@ -0,0 +1,11 @@ +#!/bin/bash + +firstLine=`awk 'NR < 2 {print}' node_modules/asn1.js-rfc5280/index.js` + +if [ "$firstLine" = "try {" ]; then + echo "var asn1 = require('asn1.js');" > node_modules/asn1.js-rfc5280/index.new.js + awk 'NR > 6 {print}' node_modules/asn1.js-rfc5280/index.js >> node_modules/asn1.js-rfc5280/index.new.js + rm node_modules/asn1.js-rfc5280/index.js + mv node_modules/asn1.js-rfc5280/index.new.js node_modules/asn1.js-rfc5280/index.js + echo "[log] node_modules/asn1.js-rfc5280/index.js fixed" +fi \ No newline at end of file From 56be096207f49ee0f94d7a071bdf01bc8081da5d Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Dominguez Date: Thu, 16 Aug 2018 17:51:20 +0900 Subject: [PATCH 2/6] quick fix for asn1 From e6ae1c052054f0c86e0022d969f23cbba41bbe59 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Dominguez Date: Thu, 16 Aug 2018 17:51:59 +0900 Subject: [PATCH 3/6] Add the command in package.json From e8f7126c89f1c1611a34f057e679a0fb5050d8e1 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Dominguez Date: Thu, 16 Aug 2018 17:52:23 +0900 Subject: [PATCH 4/6] package.json From eee1a69d84a7f415552b60405295ecfb9d051504 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Dominguez Date: Thu, 16 Aug 2018 17:54:51 +0900 Subject: [PATCH 5/6] Update package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c1f37b2e6..e1a181308 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,7 @@ "postinstall": "npm run apply:copay && echo && echo \"Repo configured for standard Copay distribution. To switch to the BitPay distribution, run 'npm run apply:bitpay'.\" && echo", "start": "echo && echo \"Choose a distribution by running 'npm run apply:copay' or 'npm run apply:bitpay'.\" && echo", "apply:copay": "npm i fs-extra@0.30 && cd app-template && node apply.js copay && cd .. && npm i", - "apply:bitcoincom": "npm i fs-extra && cd app-template && node apply.js bitcoincom && npm i && cordova prepare", + "apply:bitcoincom": "npm i fs-extra && cd app-template && node apply.js bitcoincom && npm i && cordova prepare && cd .. && ./fix-asn1.sh", "apply:bitpay": "npm i fs-extra@0.30 && cd app-template && node apply.js bitpay && cd .. && npm i", "unstage-package": "git reset package.json", "clean-all": "git clean -dfx" From 26891f6e47f6b15150a6589d9bfdf9326670f1f0 Mon Sep 17 00:00:00 2001 From: Brendon Duncan Date: Fri, 17 Aug 2018 16:54:04 +1200 Subject: [PATCH 6/6] Cleaned up log message. --- fix-asn1.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fix-asn1.sh b/fix-asn1.sh index 40c847b3f..1dbca6a67 100755 --- a/fix-asn1.sh +++ b/fix-asn1.sh @@ -7,5 +7,5 @@ if [ "$firstLine" = "try {" ]; then awk 'NR > 6 {print}' node_modules/asn1.js-rfc5280/index.js >> node_modules/asn1.js-rfc5280/index.new.js rm node_modules/asn1.js-rfc5280/index.js mv node_modules/asn1.js-rfc5280/index.new.js node_modules/asn1.js-rfc5280/index.js - echo "[log] node_modules/asn1.js-rfc5280/index.js fixed" + echo "node_modules/asn1.js-rfc5280/index.js fixed" fi \ No newline at end of file