mirror of
https://github.com/hyperledger/fabric-samples.git
synced 2026-06-26 03:25:09 +00:00
c6e77c9dd0
I tried to handle most (if not all) of the variables evaluations in the project that depends on $PWD by wrapping them in double-quotations to avoid values that contains white spaces.
Some lines I was not sure if they are Okay or not but I left them as they are. Samples (not all lines) as follows:
- commercial-paper/network-clean.sh:15:DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
- commercial-paper/network-starter.sh:15:DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
- asset-transfer-basic/chaincode-javascript/node_modules/fabric-shim/coverage/fabric-shim/lib/chaincode.js.html:997: optsCpy.pem = fs.readFileSync(process.env.CORE_PEER_TLS_ROOTCERT_FILE).toString();
- commercial-paper/organization/digibank/digibank.sh:29:export PEER_PARMS="${PEER_CONN_PARMS##*( )}"
The next sample I was not really sure, but still edited it:
- test-network/addOrg3/fabric-ca/registerEnroll.sh:68: cp ${PWD}/../organizations/peerOrganizations/org3.example.com/peers/peer0.org3.example.com/tls/tlscacerts/* ${PWD}/../organizations/peerOrganizations/org3.example.com/peers/peer0.org3.example.com/tls/ca.crt
I deliberately ignored some lines because I think they are not problem. These lines include:
- `export` sentences
- assignment sentences like: test-network/scripts/createChannel.sh:48: FABRIC_CFG_PATH=$PWD/../config/
- gradlew files: the line SAVED="`pwd`"
- gradlew files: the line APP_HOME="`pwd -P`"
- gradlew files: the line CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
Signed-off-by: Waleed Mortaja <waleedmortaja@protonmail.com>
70 lines
1.7 KiB
Bash
Executable file
70 lines
1.7 KiB
Bash
Executable file
#!/bin/bash
|
|
#
|
|
# Copyright IBM Corp. All Rights Reserved.
|
|
#
|
|
# SPDX-License-Identifier: Apache-2.0
|
|
#
|
|
|
|
# This script is designed to be run in the cli container as the
|
|
# second step of the EYFN tutorial. It joins the org3 peers to the
|
|
# channel previously setup in the BYFN tutorial and install the
|
|
# chaincode as version 2.0 on peer0.org3.
|
|
#
|
|
|
|
CHANNEL_NAME="$1"
|
|
DELAY="$2"
|
|
TIMEOUT="$3"
|
|
VERBOSE="$4"
|
|
: ${CHANNEL_NAME:="mychannel"}
|
|
: ${DELAY:="3"}
|
|
: ${TIMEOUT:="10"}
|
|
: ${VERBOSE:="false"}
|
|
COUNTER=1
|
|
MAX_RETRY=5
|
|
|
|
# import environment variables
|
|
. scripts/envVar.sh
|
|
|
|
# joinChannel ORG
|
|
joinChannel() {
|
|
ORG=$1
|
|
local rc=1
|
|
local COUNTER=1
|
|
## Sometimes Join takes time, hence retry
|
|
while [ $rc -ne 0 -a $COUNTER -lt $MAX_RETRY ] ; do
|
|
sleep $DELAY
|
|
set -x
|
|
peer channel join -b $BLOCKFILE >&log.txt
|
|
res=$?
|
|
{ set +x; } 2>/dev/null
|
|
let rc=$res
|
|
COUNTER=$(expr $COUNTER + 1)
|
|
done
|
|
cat log.txt
|
|
verifyResult $res "After $MAX_RETRY attempts, peer0.org${ORG} has failed to join channel '$CHANNEL_NAME' "
|
|
}
|
|
|
|
setAnchorPeer() {
|
|
ORG=$1
|
|
scripts/setAnchorPeer.sh $ORG $CHANNEL_NAME
|
|
}
|
|
|
|
setGlobalsCLI 3
|
|
BLOCKFILE="${CHANNEL_NAME}.block"
|
|
|
|
echo "Fetching channel config block from orderer..."
|
|
set -x
|
|
peer channel fetch 0 $BLOCKFILE -o orderer.example.com:7050 --ordererTLSHostnameOverride orderer.example.com -c $CHANNEL_NAME --tls --cafile "$ORDERER_CA" >&log.txt
|
|
res=$?
|
|
{ set +x; } 2>/dev/null
|
|
cat log.txt
|
|
verifyResult $res "Fetching config block from orderer has failed"
|
|
|
|
infoln "Joining org3 peer to the channel..."
|
|
joinChannel 3
|
|
|
|
infoln "Setting anchor peer for org3..."
|
|
setAnchorPeer 3
|
|
|
|
successln "Channel '$CHANNEL_NAME' joined"
|
|
successln "Org3 peer successfully added to network"
|