From e876d5fdf1d51d65dda400c16a1e1da52d6b2c50 Mon Sep 17 00:00:00 2001
From: blavenie <benoit.lavenier@e-is.pro>
Date: Wed, 2 Aug 2017 19:58:28 +0200
Subject: [PATCH] do not download revocation if click "later" fix release
script
---
release.sh | 6 +++---
www/js/controllers/join-controllers.js | 3 ++-
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/release.sh b/release.sh
index 5a06c22dc..82c2cd286 100755
--- a/release.sh
+++ b/release.sh
@@ -23,9 +23,9 @@ if [[ $2 =~ ^[0-9]+.[0-9]+.[0-9]+((a|b)[0-9]+)?$ && $3 =~ ^[0-9]+$ ]]; then
case "$1" in
rel|pre)
# Change the version in package.json and test file
- sed -i "s/version\": \"$current/version\": \"$2/g" package.json
- sed -i "s/ version=\".*\"/ version=\"$2\"/g" config.xml
- sed -i "s/ android-versionCode=\".*\"/ android-versionCode=\"$3\"/g" config.xml
+ sed -i "s/version\": \"$current\"/version\": \"$2\"/g" package.json
+ sed -i "s/ version=\"[^\"]+\"/ version=\"$2\"/g" config.xml
+ sed -i "s/ android-versionCode=\"[^\"]+\"/ android-versionCode=\"$3\"/g" config.xml
# Bump the install.sh
sed -i "s/echo \"v.*\" #lastest/echo \"v$2\" #lastest/g" install.sh
diff --git a/www/js/controllers/join-controllers.js b/www/js/controllers/join-controllers.js
index 114be6c1e..64c529096 100644
--- a/www/js/controllers/join-controllers.js
+++ b/www/js/controllers/join-controllers.js
@@ -377,7 +377,8 @@ function JoinModalController($scope, $state, $interval, $timeout, UIUtils, Crypt
okType: 'button-assertive',
cancelText: 'COMMON.BTN_LATER'
})
- .then(function() {
+ .then(function(confirm) {
+ if (!confirm) return;
return csWallet.downloadRevocation();
});
};
--
GitLab