Move MSYS_NO_PATHCONV=1 to after blockchain init

MSYS_NO_PATHCONV=1 generates an error running the first-network blockchain so its better to place it after the blockchain is up
This commit is contained in:
Ana Maria Franco 2019-08-17 07:54:13 -05:00 committed by GitHub
parent fc5975b285
commit 0872d8b8e7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -8,7 +8,6 @@
set -e set -e
# don't rewrite paths for Windows Git Bash users # don't rewrite paths for Windows Git Bash users
export MSYS_NO_PATHCONV=1
starttime=$(date +%s) starttime=$(date +%s)
CC_SRC_LANGUAGE=${1:-"go"} CC_SRC_LANGUAGE=${1:-"go"}
CC_SRC_LANGUAGE=`echo "$CC_SRC_LANGUAGE" | tr [:upper:] [:lower:]` CC_SRC_LANGUAGE=`echo "$CC_SRC_LANGUAGE" | tr [:upper:] [:lower:]`
@ -45,6 +44,8 @@ cd ../first-network
echo y | ./byfn.sh down echo y | ./byfn.sh down
echo y | ./byfn.sh up -a -n -s couchdb echo y | ./byfn.sh up -a -n -s couchdb
export MSYS_NO_PATHCONV=1
CONFIG_ROOT=/opt/gopath/src/github.com/hyperledger/fabric/peer CONFIG_ROOT=/opt/gopath/src/github.com/hyperledger/fabric/peer
ORG1_MSPCONFIGPATH=${CONFIG_ROOT}/crypto/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp ORG1_MSPCONFIGPATH=${CONFIG_ROOT}/crypto/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp
ORG1_TLS_ROOTCERT_FILE=${CONFIG_ROOT}/crypto/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/ca.crt ORG1_TLS_ROOTCERT_FILE=${CONFIG_ROOT}/crypto/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/ca.crt