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

fix merge conflicts

Browse source
This commit is contained in:
Marty Alcala 2016-10-27 11:44:03 -04:00
commit d4513ba46b
53 changed files with 263 additions and 204 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app-template/build-macos.sh
View file

@ -116,6 +116,9 @@ mkdir /Volumes/"${VOL_NAME}"/.background
cp "${DMG_BACKGROUND_IMG}" /Volumes/"${VOL_NAME}"/.background/
echo "Adding volume icon to disk image"
# we install this here to avoid trying to install it on linux or windows, where
# it fails to install
npm install fileicon
# use fileicon node_module
cp "${DMG_VOLUME_ICON}" /Volumes/"${VOL_NAME}"/.VolumeIcon.icns
`npm bin`/fileicon set /Volumes/"${VOL_NAME}"/ /Volumes/"${VOL_NAME}"/.VolumeIcon.icns

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

@ -45,6 +45,10 @@
"bugs": {
"url": "*GITHUBREPOBUGS*"
},
"engines": {
"node": "6",
"npm": "3"
},
"dependencies": {
"adm-zip": "^0.4.7",
"angular": "1.4.6",
@ -103,7 +107,7 @@
"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": "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",
"test": "echo \"no package tests configured\"",
"clean": "trash platforms && trash plugins && cordova prepare",
"unstage-package": "git reset package.json",
"clean-all": "git clean -dfx"
@ -114,7 +118,6 @@
"ionic": "^2.1.0",
"trash-cli": "^1.4.0",
"lodash": "^4.3.0",
"fileicon": "^0.1.8",
"pre-commit": "^1.1.3"
},
"pre-commit": "unstage-package"