[FAB-9495] Fix to be able to get a specific images

- Add grep option -P which is Perl regular expression. Since grep's
  default mode is POSIX, grep can't realize '\d'. As a result, user
  can't get a specific version of fabric's docker images
- Move the definition of CA/FABRIC/THIRDPARTY_TAG to after the line
  checking an argument. In the current script, VERSION doesn't
  reflect *_TAG.

Change-Id: Ib44f659d3746d0ab976475df385b028fb34b9f41
Signed-off-by: Nao Nishijima <nao.nishijima@hal.hitachi.com>

Author: Nao Nishijima

scripts/bootstrap.sh

@@ -54,10 +54,6 @@ dockerCaPull() {
       docker tag hyperledger/fabric-ca:$CA_TAG hyperledger/fabric-ca
 }
 
-: ${CA_TAG:="$MARCH-$CA_VERSION"}
-: ${FABRIC_TAG:="$MARCH-$VERSION"}
-: ${THIRDPARTY_TAG:="$MARCH-$THIRDPARTY_IMAGE_VERSION"}
-
 samplesInstall() {
   # clone (if needed) hyperledger/fabric-samples and checkout corresponding
   # version to the binaries and docker images to be downloaded
@@ -115,13 +111,17 @@ BINARIES=true
 
 # Parse commandline args pull out
 # version and/or ca-version strings first
-if echo $1 | grep -q '\d'; then
+if echo $1 | grep -P -q '\d'; then
   VERSION=$1;shift
-  if echo $1 | grep -q '\d'; then
+  if echo $1 | grep -P -q '\d'; then
     CA_VERSION=$1;shift
   fi
 fi
 
+: ${CA_TAG:="$MARCH-$CA_VERSION"}
+: ${FABRIC_TAG:="$MARCH-$VERSION"}
+: ${THIRDPARTY_TAG:="$MARCH-$THIRDPARTY_IMAGE_VERSION"}
+
 # then parse opts
 while getopts "h?dsb" opt; do
   case "$opt" in