epistemophiliac/fabric-samples
1
0
Fork 0
mirror of https://github.com/hyperledger/fabric-samples.git synced 2026-06-22 17:45:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[FAB-9326] Clean up byfn.sh, drop "-m" option

Browse source 
Some general cleanup of byfn.sh script:

 - Given that "-m" is deprecated, remove its normal processing,
   but retain (for now) its early recognition so that CI passes.
 - Drop reference to "--help", only "-h" is supported.
 - Add reference to "upgrade" mode to usage message and comment.

Change-Id: If1d6624c8788ec660abca5d13e7c87aafb13ce59
Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
This commit is contained in:
Robert P. J. Day 2018-04-22 14:01:31 -04:00
parent 54b071bfdc
commit 010fcb544f
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
first-network/byfn.sh
View file

@ -35,9 +35,8 @@ export VERBOSE=false
# Print the usage message # Print the usage message
function printHelp () { function printHelp () {
echo "Usage: " echo "Usage: "
echo " byfn.sh up|down|restart|generate|upgrade [-c <channel name>] [-t <timeout>] [-d <delay>] [-f <docker-compose-file>] [-s <dbtype>] [-i <imagetag>]" echo " byfn.sh <mode> [-c <channel name>] [-t <timeout>] [-d <delay>] [-f <docker-compose-file>] [-s <dbtype>] [-l <language>] [-i <imagetag>] [-v]"
echo " byfn.sh -h|--help (print this message)" echo " <mode> - one of 'up', 'down', 'restart', 'generate' or 'upgrade'"
echo " <mode> - one of 'up', 'down', 'restart' or 'generate'"
echo " - 'up' - bring up the network with docker-compose up" echo " - 'up' - bring up the network with docker-compose up"
echo " - 'down' - clear the network with docker-compose down" echo " - 'down' - clear the network with docker-compose down"
echo " - 'restart' - restart the network" echo " - 'restart' - restart the network"
@ -51,6 +50,7 @@ function printHelp () {
echo " -l <language> - the chaincode language: golang (default) or node" echo " -l <language> - the chaincode language: golang (default) or node"
echo " -i <imagetag> - the tag to be used to launch the network (defaults to \"latest\")" echo " -i <imagetag> - the tag to be used to launch the network (defaults to \"latest\")"
echo " -v - verbose mode" echo " -v - verbose mode"
echo " byfn.sh -h (print this message)"
echo echo
echo "Typically, one would first generate the required certificates and " echo "Typically, one would first generate the required certificates and "
echo "genesis block, then bring up the network. e.g.:" echo "genesis block, then bring up the network. e.g.:"
@ -456,7 +456,7 @@ if [ "$1" = "-m" ];then # supports old usage, muscle memory is powerful!
shift shift
fi fi
MODE=$1;shift MODE=$1;shift
# Determine whether starting, stopping, restarting or generating for announce # Determine whether starting, stopping, restarting, generating or upgrading
if [ "$MODE" == "up" ]; then if [ "$MODE" == "up" ]; then
EXPMODE="Starting" EXPMODE="Starting"
elif [ "$MODE" == "down" ]; then elif [ "$MODE" == "down" ]; then
@ -472,7 +472,7 @@ else
exit 1 exit 1
fi fi
while getopts "h?m:c:t:d:f:s:l:i:v" opt; do while getopts "h?c:t:d:f:s:l:i:v" opt; do
case "$opt" in case "$opt" in
h|\?) h|\?)
printHelp printHelp