Fix install.sh script Remove the tag for building crypto so it match the python wrapper Fix config override to work as expected. The messages are now correct and the check for override is now working as expected
Project: http://git-wip-us.apache.org/repos/asf/incubator-milagro-mfa-server/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-milagro-mfa-server/commit/60b1fc97 Tree: http://git-wip-us.apache.org/repos/asf/incubator-milagro-mfa-server/tree/60b1fc97 Diff: http://git-wip-us.apache.org/repos/asf/incubator-milagro-mfa-server/diff/60b1fc97 Branch: refs/heads/master Commit: 60b1fc97699b5ee2bc3bb178ae7c8e59eb860d22 Parents: 3e62443 Author: Pavlin Angelov <[email protected]> Authored: Tue Jun 21 16:01:15 2016 +0300 Committer: Pavlin Angelov <[email protected]> Committed: Thu Jun 23 15:30:51 2016 +0300 ---------------------------------------------------------------------- install.sh | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-milagro-mfa-server/blob/60b1fc97/install.sh ---------------------------------------------------------------------- diff --git a/install.sh b/install.sh index 8505234..03df987 100755 --- a/install.sh +++ b/install.sh @@ -36,7 +36,6 @@ function get_crypto { git clone https://github.com/miracl/milagro-crypto.git cd milagro-crypto || exit - git checkout tags/1.0.0 } function build_crypto { @@ -99,7 +98,7 @@ function configure_dta { esac fi - if [ $CONFIGURE ] + if [ $CONFIGURE == 1 ] then cp config_default.py config.py CONFIG_FILE=$(pwd)/config.py @@ -125,7 +124,7 @@ function configure_rps { CONFIGURE=1 if [ -f config.py ] then - echo "NOTE: Config file for DTA already exist" + echo "NOTE: Config file for RPS already exist" read -p "Do you want to override it (y/n)?" choice case "$choice" in y|Y ) echo "yes"; CONFIGURE=1;; @@ -134,7 +133,7 @@ function configure_rps { esac fi - if [ $CONFIGURE ] + if [ $CONFIGURE == 1 ] then cp config_default.py config.py @@ -153,7 +152,7 @@ function configure_demo { CONFIGURE=1 if [ -f config.py ] then - echo "NOTE: Config file for DTA already exist" + echo "NOTE: Config file for DEMO RPA already exist" read -p "Do you want to override it (y/n)?" choice case "$choice" in y|Y ) echo "yes"; CONFIGURE=1;; @@ -162,7 +161,7 @@ function configure_demo { esac fi - if [ $CONFIGURE ] + if [ $CONFIGURE == 1 ] then cp config_default.py config.py
