diff --git a/package.json b/package.json index 8ad0cb64734988ea008bfe630865982acdadf98d..955947de86ed8d7d92b17deeb013fb8e7903e27c 100644 --- a/package.json +++ b/package.json @@ -2,6 +2,8 @@ "name": "cesium", "version": "1.4.12", "description": "Cesium Wallet for G1 libre currency", + "author": "Benoit Lavenier <benoit.lavenier@e-is.pro>", + "license": "AGPL-3.0", "repository": { "type": "git", "url": "git@git.duniter.org:clients/cesium/cesium.git" @@ -22,8 +24,6 @@ "cordova", "crypto-currency" ], - "author": "Benoit Lavenier <benoit.lavenier@e-is.pro>", - "license": "AGPL-3.0", "readmeFilename": "README.md", "bugs": { "url": "https://git.duniter.org/clients/cesium-grp/cesium/issues", @@ -131,7 +131,7 @@ { "platform": "ios", "version": "5.1.0", - "locator": "https://github.com/E-IS/cordova-ios.git#5.1.0" + "locator": "https://github.com/bpresles/cordova-ios.git#5.1.0" }, { "platform": "android", @@ -169,4 +169,4 @@ "osx" ] } -} \ No newline at end of file +} diff --git a/release.sh b/release.sh index a394cf0fa914b8cf8a2783286ee4a97dfbc06042..6d243caa2508dc88f4990366544055111d5ba495 100755 --- a/release.sh +++ b/release.sh @@ -161,12 +161,17 @@ echo "----------------------------------" echo "- Building desktop artifacts..." echo "----------------------------------" -git submodule init -git submodule sync -git submodule update --remote --merge +git submodule init && git submodule sync && git submodule update --remote --merge +if [[ $? -ne 0 ]]; then + echo "Unable to sync git submodule. Could not build desktop version" + exit 1 +fi if [[ -d "${DIRNAME}/platforms/desktop" ]]; then - cd ${DIRNAME}/platforms/desktop + cd "${DIRNAME}/platforms/desktop" + + # Fetch last updates + git fetch origin && git merge origin/master || exit 1 # Build desktop assets ./release.sh $2 diff --git a/resources/android/store/logo_512px.png b/resources/android/store/logo_512px.png new file mode 100644 index 0000000000000000000000000000000000000000..68daf16b415754e4300fa873514780a16f509082 Binary files /dev/null and b/resources/android/store/logo_512px.png differ