Skip to content

Commit 20ad472

Browse files
author
Naga Pemmara
committed
FAB-10801 format and styling for shell artifacts
formatting for existing shell scripts Change-Id: I7e067730558bc55edc74b73e59195af7c825d8b2 Signed-off-by: Naga Pemmara <naga.pemmaraju@ibm.com>
1 parent e95210e commit 20ad472

File tree

2 files changed

+277
-268
lines changed

2 files changed

+277
-268
lines changed

‎first-network/byfn.sh

+75-67
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ export FABRIC_CFG_PATH=${PWD}
3333
export VERBOSE=false
3434

3535
# Print the usage message
36-
function printHelp () {
36+
function printHelp() {
3737
echo "Usage: "
3838
echo " byfn.sh <mode> [-c <channel name>] [-t <timeout>] [-d <delay>] [-f <docker-compose-file>] [-s <dbtype>] [-l <language>] [-i <imagetag>] [-v]"
3939
echo " <mode> - one of 'up', 'down', 'restart', 'generate' or 'upgrade'"
@@ -69,27 +69,27 @@ function printHelp () {
6969
}
7070

7171
# Ask user for confirmation to proceed
72-
function askProceed () {
72+
function askProceed() {
7373
read -p "Continue? [Y/n] " ans
7474
case "$ans" in
75-
y|Y|"" )
76-
echo "proceeding ..."
75+
y | Y | "")
76+
echo "proceeding ..."
7777
;;
78-
n|N )
79-
echo "exiting..."
80-
exit 1
78+
n | N)
79+
echo "exiting..."
80+
exit 1
8181
;;
82-
* )
83-
echo "invalid response"
84-
askProceed
82+
*)
83+
echo "invalid response"
84+
askProceed
8585
;;
8686
esac
8787
}
8888

8989
# Obtain CONTAINER_IDS and remove them
9090
# TODO Might want to make this optional - could clear other containers
91-
function clearContainers () {
92-
CONTAINER_IDS=$(docker ps -a |awk '($2 ~ /dev-peer.*.mycc.*/) {print $1}')
91+
function clearContainers() {
92+
CONTAINER_IDS=$(docker ps -a | awk '($2 ~ /dev-peer.*.mycc.*/) {print $1}')
9393
if [ -z "$CONTAINER_IDS" -o "$CONTAINER_IDS" == " " ]; then
9494
echo "---- No containers available for deletion ----"
9595
else
@@ -101,7 +101,7 @@ function clearContainers () {
101101
# specifically the following images are often left behind:
102102
# TODO list generated image naming patterns
103103
function removeUnwantedImages() {
104-
DOCKER_IMAGE_IDS=$(docker images|awk '($1 ~ /dev-peer.*.mycc.*/) {print $3}')
104+
DOCKER_IMAGE_IDS=$(docker images | awk '($1 ~ /dev-peer.*.mycc.*/) {print $3}')
105105
if [ -z "$DOCKER_IMAGE_IDS" -o "$DOCKER_IMAGE_IDS" == " " ]; then
106106
echo "---- No images available for deletion ----"
107107
else
@@ -119,35 +119,35 @@ function checkPrereqs() {
119119
# Note, we check configtxlator externally because it does not require a config file, and peer in the
120120
# docker image because of FAB-8551 that makes configtxlator return 'development version' in docker
121121
LOCAL_VERSION=$(configtxlator version | sed -ne 's/ Version: //p')
122-
DOCKER_IMAGE_VERSION=$(docker run --rm hyperledger/fabric-tools:$IMAGETAG peer version | sed -ne 's/ Version: //p'|head -1)
122+
DOCKER_IMAGE_VERSION=$(docker run --rm hyperledger/fabric-tools:$IMAGETAG peer version | sed -ne 's/ Version: //p' | head -1)
123123

124124
echo "LOCAL_VERSION=$LOCAL_VERSION"
125125
echo "DOCKER_IMAGE_VERSION=$DOCKER_IMAGE_VERSION"
126126

127-
if [ "$LOCAL_VERSION" != "$DOCKER_IMAGE_VERSION" ] ; then
128-
echo "=================== WARNING ==================="
129-
echo " Local fabric binaries and docker images are "
130-
echo " out of sync. This may cause problems. "
131-
echo "==============================================="
127+
if [ "$LOCAL_VERSION" != "$DOCKER_IMAGE_VERSION" ]; then
128+
echo "=================== WARNING ==================="
129+
echo " Local fabric binaries and docker images are "
130+
echo " out of sync. This may cause problems. "
131+
echo "==============================================="
132132
fi
133133

134-
for UNSUPPORTED_VERSION in $BLACKLISTED_VERSIONS ; do
135-
echo "$LOCAL_VERSION" | grep -q $UNSUPPORTED_VERSION
136-
if [ $? -eq 0 ] ; then
137-
echo "ERROR! Local Fabric binary version of $LOCAL_VERSION does not match this newer version of BYFN and is unsupported. Either move to a later version of Fabric or checkout an earlier version of fabric-samples."
138-
exit 1
139-
fi
140-
141-
echo "$DOCKER_IMAGE_VERSION" | grep -q $UNSUPPORTED_VERSION
142-
if [ $? -eq 0 ] ; then
143-
echo "ERROR! Fabric Docker image version of $DOCKER_IMAGE_VERSION does not match this newer version of BYFN and is unsupported. Either move to a later version of Fabric or checkout an earlier version of fabric-samples."
144-
exit 1
145-
fi
134+
for UNSUPPORTED_VERSION in $BLACKLISTED_VERSIONS; do
135+
echo "$LOCAL_VERSION" | grep -q $UNSUPPORTED_VERSION
136+
if [ $? -eq 0 ]; then
137+
echo "ERROR! Local Fabric binary version of $LOCAL_VERSION does not match this newer version of BYFN and is unsupported. Either move to a later version of Fabric or checkout an earlier version of fabric-samples."
138+
exit 1
139+
fi
140+
141+
echo "$DOCKER_IMAGE_VERSION" | grep -q $UNSUPPORTED_VERSION
142+
if [ $? -eq 0 ]; then
143+
echo "ERROR! Fabric Docker image version of $DOCKER_IMAGE_VERSION does not match this newer version of BYFN and is unsupported. Either move to a later version of Fabric or checkout an earlier version of fabric-samples."
144+
exit 1
145+
fi
146146
done
147147
}
148148

149149
# Generate the needed certificates, the genesis block and start the network.
150-
function networkUp () {
150+
function networkUp() {
151151
checkPrereqs
152152
# generate artifacts if they don't exist
153153
if [ ! -d "crypto-config" ]; then
@@ -175,8 +175,8 @@ function networkUp () {
175175
# Upgrade the network from v1.0.x to v1.1
176176
# Stop the orderer and peers, backup the ledger from orderer and peers, cleanup chaincode containers and images
177177
# and relaunch the orderer and peers with latest tag
178-
function upgradeNetwork () {
179-
docker inspect -f '{{.Config.Volumes}}' orderer.example.com |grep -q '/var/hyperledger/production/orderer'
178+
function upgradeNetwork() {
179+
docker inspect -f '{{.Config.Volumes}}' orderer.example.com | grep -q '/var/hyperledger/production/orderer'
180180
if [ $? -ne 0 ]; then
181181
echo "ERROR !!!! This network does not appear to be using volumes for its ledgers, did you start from fabric-samples >= v1.0.6?"
182182
exit 1
@@ -189,9 +189,9 @@ function upgradeNetwork () {
189189

190190
export IMAGE_TAG=$IMAGETAG
191191
if [ "${IF_COUCHDB}" == "couchdb" ]; then
192-
COMPOSE_FILES="-f $COMPOSE_FILE -f $COMPOSE_FILE_COUCH"
192+
COMPOSE_FILES="-f $COMPOSE_FILE -f $COMPOSE_FILE_COUCH"
193193
else
194-
COMPOSE_FILES="-f $COMPOSE_FILE"
194+
COMPOSE_FILES="-f $COMPOSE_FILE"
195195
fi
196196

197197
# removing the cli container
@@ -212,12 +212,12 @@ function upgradeNetwork () {
212212

213213
# Remove any old containers and images for this peer
214214
CC_CONTAINERS=$(docker ps | grep dev-$PEER | awk '{print $1}')
215-
if [ -n "$CC_CONTAINERS" ] ; then
216-
docker rm -f $CC_CONTAINERS
215+
if [ -n "$CC_CONTAINERS" ]; then
216+
docker rm -f $CC_CONTAINERS
217217
fi
218218
CC_IMAGES=$(docker images | grep dev-$PEER | awk '{print $1}')
219-
if [ -n "$CC_IMAGES" ] ; then
220-
docker rmi -f $CC_IMAGES
219+
if [ -n "$CC_IMAGES" ]; then
220+
docker rmi -f $CC_IMAGES
221221
fi
222222

223223
# Start the peer again
@@ -231,9 +231,8 @@ function upgradeNetwork () {
231231
fi
232232
}
233233

234-
235234
# Tear down running network
236-
function networkDown () {
235+
function networkDown() {
237236
# stop org3 containers also in addition to org1 and org2, in case we were running sample to add org3
238237
docker-compose -f $COMPOSE_FILE -f $COMPOSE_FILE_COUCH -f $COMPOSE_FILE_ORG3 down --volumes --remove-orphans
239238

@@ -256,10 +255,10 @@ function networkDown () {
256255
# Using docker-compose-e2e-template.yaml, replace constants with private key file names
257256
# generated by the cryptogen tool and output a docker-compose.yaml specific to this
258257
# configuration
259-
function replacePrivateKey () {
258+
function replacePrivateKey() {
260259
# sed on MacOSX does not support -i flag with a null extension. We will use
261260
# 't' for our back-up's extension and delete it at the end of the function
262-
ARCH=`uname -s | grep Darwin`
261+
ARCH=$(uname -s | grep Darwin)
263262
if [ "$ARCH" == "Darwin" ]; then
264263
OPTS="-it"
265264
else
@@ -304,7 +303,7 @@ function replacePrivateKey () {
304303
# After we run the tool, the certs will be parked in a folder titled ``crypto-config``.
305304

306305
# Generates Org certs using cryptogen tool
307-
function generateCerts (){
306+
function generateCerts() {
308307
which cryptogen
309308
if [ "$?" -ne 0 ]; then
310309
echo "cryptogen tool not found. exiting"
@@ -419,7 +418,7 @@ function generateChannelArtifacts() {
419418
echo "#################################################################"
420419
set -x
421420
configtxgen -profile TwoOrgsChannel -outputAnchorPeersUpdate \
422-
./channel-artifacts/Org2MSPanchors.tx -channelID $CHANNEL_NAME -asOrg Org2MSP
421+
./channel-artifacts/Org2MSPanchors.tx -channelID $CHANNEL_NAME -asOrg Org2MSP
423422
res=$?
424423
set +x
425424
if [ $res -ne 0 ]; then
@@ -431,7 +430,7 @@ function generateChannelArtifacts() {
431430

432431
# Obtain the OS and Architecture string that will be used to select the correct
433432
# native binaries for your platform
434-
OS_ARCH=$(echo "$(uname -s|tr '[:upper:]' '[:lower:]'|sed 's/mingw64_nt.*/windows/')-$(uname -m | sed 's/x86_64/amd64/g')" | awk '{print tolower($0)}')
433+
OS_ARCH=$(echo "$(uname -s | tr '[:upper:]' '[:lower:]' | sed 's/mingw64_nt.*/windows/')-$(uname -m | sed 's/x86_64/amd64/g')" | awk '{print tolower($0)}')
435434
# timeout duration - the duration the CLI should wait for a response from
436435
# another container before giving up
437436
CLI_TIMEOUT=10
@@ -451,10 +450,11 @@ LANGUAGE=golang
451450
# default image tag
452451
IMAGETAG="latest"
453452
# Parse commandline args
454-
if [ "$1" = "-m" ];then # supports old usage, muscle memory is powerful!
455-
shift
453+
if [ "$1" = "-m" ]; then # supports old usage, muscle memory is powerful!
454+
shift
456455
fi
457-
MODE=$1;shift
456+
MODE=$1
457+
shift
458458
# Determine whether starting, stopping, restarting, generating or upgrading
459459
if [ "$MODE" == "up" ]; then
460460
EXPMODE="Starting"
@@ -473,37 +473,45 @@ fi
473473

474474
while getopts "h?c:t:d:f:s:l:i:v" opt; do
475475
case "$opt" in
476-
h|\?)
477-
printHelp
478-
exit 0
476+
h | \?)
477+
printHelp
478+
exit 0
479479
;;
480-
c) CHANNEL_NAME=$OPTARG
480+
c)
481+
CHANNEL_NAME=$OPTARG
481482
;;
482-
t) CLI_TIMEOUT=$OPTARG
483+
t)
484+
CLI_TIMEOUT=$OPTARG
483485
;;
484-
d) CLI_DELAY=$OPTARG
486+
d)
487+
CLI_DELAY=$OPTARG
485488
;;
486-
f) COMPOSE_FILE=$OPTARG
489+
f)
490+
COMPOSE_FILE=$OPTARG
487491
;;
488-
s) IF_COUCHDB=$OPTARG
492+
s)
493+
IF_COUCHDB=$OPTARG
489494
;;
490-
l) LANGUAGE=$OPTARG
495+
l)
496+
LANGUAGE=$OPTARG
491497
;;
492-
i) IMAGETAG=`uname -m`"-"$OPTARG
498+
i)
499+
IMAGETAG=$(uname -m)"-"$OPTARG
493500
;;
494-
v) VERBOSE=true
501+
v)
502+
VERBOSE=true
495503
;;
496504
esac
497505
done
498506

499507
# Announce what was requested
500508

501-
if [ "${IF_COUCHDB}" == "couchdb" ]; then
502-
echo
503-
echo "${EXPMODE} with channel '${CHANNEL_NAME}' and CLI timeout of '${CLI_TIMEOUT}' seconds and CLI delay of '${CLI_DELAY}' seconds and using database '${IF_COUCHDB}'"
504-
else
505-
echo "${EXPMODE} with channel '${CHANNEL_NAME}' and CLI timeout of '${CLI_TIMEOUT}' seconds and CLI delay of '${CLI_DELAY}' seconds"
506-
fi
509+
if [ "${IF_COUCHDB}" == "couchdb" ]; then
510+
echo
511+
echo "${EXPMODE} with channel '${CHANNEL_NAME}' and CLI timeout of '${CLI_TIMEOUT}' seconds and CLI delay of '${CLI_DELAY}' seconds and using database '${IF_COUCHDB}'"
512+
else
513+
echo "${EXPMODE} with channel '${CHANNEL_NAME}' and CLI timeout of '${CLI_TIMEOUT}' seconds and CLI delay of '${CLI_DELAY}' seconds"
514+
fi
507515
# ask for confirmation to proceed
508516
askProceed
509517

0 commit comments

Comments
 (0)