Commit e3274487 authored by Nao Nishijima's avatar Nao Nishijima
Browse files

[FAB-4906] sed error in generateArtifacts.sh



generateArtifacts.sh does not work at 2nd time. Due to generating
a private key every time, if we execute generateArtifacts.sh more
than once, the command to get the private key will return more
than one result. However, we do not expect this result.
This patch set adds checking code of the existence of crypto-config
dir at the beginning.

Change-Id: Ie9249556c1988e30463683f688e4e50dc75d7b15
Signed-off-by: default avatarNao Nishijima <nao.nishijima@hal.hitachi.com>
parent dc7c40b7
......@@ -52,9 +52,13 @@ function removeUnwantedImages() {
}
function networkUp () {
#Generate all the artifacts that includes org certs, orderer genesis block,
# channel configuration transaction
source generateArtifacts.sh $CH_NAME
if [ -f "./crypto-config" ]; then
echo "crypto-config directory already exists."
else
#Generate all the artifacts that includes org certs, orderer genesis block,
# channel configuration transaction
source generateArtifacts.sh $CH_NAME
fi
if [ "${IF_COUCHDB}" == "couchdb" ]; then
CHANNEL_NAME=$CH_NAME TIMEOUT=$CLI_TIMEOUT docker-compose -f $COMPOSE_FILE -f $COMPOSE_FILE_COUCH up -d 2>&1
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment