Skip to content
Snippets Groups Projects
Commit 4c9e4a44 authored by Benoit Lavenier's avatar Benoit Lavenier
Browse files

- Wallet load : Make sure to use correct willExpireCertificationCount - fix #240

parent 9ee10195
No related branches found
No related tags found
No related merge requests found
# Deployment
## Deploy script
This is a script example, that you can use to deploy the latest release.
This script will create or replace a directory name `cesium`, where application will be unpack.
**Be aware** that the destination directory will be created **where the script is**.
```bash
#!/bin/bash
READLINK=`which readlink`
if [ -z "$READLINK" ]; then
message "Required tool 'readlink' is missing. Please install before launch \"$0\" file."
exit 1
fi
# ------------------------------------------------------------------
# Ensure BASEDIR points to the directory where the soft is installed.
# ------------------------------------------------------------------
SCRIPT_LOCATION=$0
if [ -x "$READLINK" ]; then
while [ -L "$SCRIPT_LOCATION" ]; do
SCRIPT_LOCATION=`"$READLINK" -e "$SCRIPT_LOCATION"`
done
fi
export BASEDIR=`dirname "$SCRIPT_LOCATION"`
cd $BASEDIR
echo "Installing cesium into '$BASEDIR/cesium'..."
wget -qO- https://raw.githubusercontent.com/duniter/cesium/master/install.sh | bash
export VERSION=`sed -rn "s/\s*\"version\": \"([^\"]*)\",\s*/\1/p" cesium/config.js`
export BUILD=`sed -rn "s/\s*\"build\": \"([^\"]*)\",\s*/\1/p" cesium/config.js`
echo "Detected version: $VERSION"
echo " build: $BUILD"
if [ -e "$BASEDIR/config.js" ]; then
echo "Override config file using '$BASEDIR/config.js'"
cp -f cesium/config.js cesium/config.js.ori
cp -f config.js cesium/
# Keep version and build from original config file
sed -i "s/\"version\": \"[^\"]*\"/\"version\": \"${VERSION}\"/g" cesium/config.js
sed -i "s/\"build\": \"[^\"]*\"/\"build\": \"${BUILD}\"/g" cesium/config.js
fi
echo "Done !"
```
\ No newline at end of file
...@@ -662,7 +662,7 @@ angular.module('cesium.wallet.services', ['ngResource', 'ngApi', 'cesium.bma.ser ...@@ -662,7 +662,7 @@ angular.module('cesium.wallet.services', ['ngResource', 'ngApi', 'cesium.bma.ser
(data.parameters.sigQty - data.requirements.certificationCount) : 0; (data.parameters.sigQty - data.requirements.certificationCount) : 0;
data.requirements.willNeedCertificationCount = (!data.requirements.needMembership && data.requirements.willNeedCertificationCount = (!data.requirements.needMembership &&
data.requirements.needCertificationCount === 0 && (data.requirements.certificationCount - data.requirements.willExpireCertificationCount) < data.parameters.sigQty) ? data.requirements.needCertificationCount === 0 && (data.requirements.certificationCount - data.requirements.willExpireCertificationCount) < data.parameters.sigQty) ?
(data.parameters.sigQty - data.requirements.certificationCount - willExpireCertificationCount) : 0; (data.parameters.sigQty - data.requirements.certificationCount - data.requirements.willExpireCertificationCount) : 0;
// Add user events // Add user events
data.events = data.events.reduce(function(res, event) { data.events = data.events.reduce(function(res, event) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment