Fix bootstrap_instance function by adding missing newlines

The which cfn-init command was executed with the previous line
so the aws-cfn-bootstrap package was always downloaded.

It also fixes the cfn bootstrap in china

Signed-off-by: Enrico Usai <[email protected]>

Author: enrico-usai

cloudformation/aws-parallelcluster.cfn.json

@@ -1998,7 +1998,7 @@
                   "  tar -xzf /etc/chef/aws-parallelcluster-cookbook.tgz\n",
                   "  HOME_BAK=\"${HOME}\"\n",
                   "  export HOME=\"/tmp\"\n",
-                  "  . /tmp/proxy.sh\n",
+                  "  . /tmp/proxy.sh;\n",
                   "  for d in `ls /tmp/cookbooks`; do\n",
                   "    cd /tmp/cookbooks/$d\n",
                   "    LANG=en_US.UTF-8 /opt/chef/embedded/bin/berks vendor /etc/chef/cookbooks --delete || error_exit 'Vendoring cookbook failed.'\n",
@@ -2015,7 +2015,7 @@
                   "  if [ \"${apt}\" == \"0\" ]; then\n",
                   "    apt-cache search build-essential; apt-get clean; apt-get update; apt-get -y install build-essential curl wget jq python-setuptools awscli\n",
                   "  fi\n",
-                  "  [[ ${_region} =~ ^cn- ]] && s3_url=\"cn-north-1.amazonaws.com.cn/cn-north-1-aws-parallelcluster\"",
+                  "  [[ ${_region} =~ ^cn- ]] && s3_url=\"cn-north-1.amazonaws.com.cn/cn-north-1-aws-parallelcluster\"\n",
                   "  which cfn-init 2>/dev/null || ( curl -s -L -o /tmp/aws-cfn-bootstrap-latest.tar.gz https://s3.${s3_url}/cloudformation-examples/aws-cfn-bootstrap-latest.tar.gz; easy_install -U /tmp/aws-cfn-bootstrap-latest.tar.gz)\n",
                   "  mkdir -p /etc/chef && chown -R root:root /etc/chef\n",
                   "  curl --retry 3 -L https://www.chef.io/chef/install.sh | bash -s -- -v ${chef_version}\n",
@@ -2934,14 +2934,14 @@
                   "  mkdir /tmp/cookbooks\n",
                   "  cd /tmp/cookbooks\n",
                   "  tar -xzf /etc/chef/aws-parallelcluster-cookbook.tgz\n",
-                  "  HOME_BAK=${HOME}\n",
+                  "  HOME_BAK=\"${HOME}\"\n",
                   "  export HOME=\"/tmp\"\n",
                   "  . /tmp/proxy.sh;\n",
                   "  for d in `ls /tmp/cookbooks`; do\n",
                   "    cd /tmp/cookbooks/$d\n",
                   "    LANG=en_US.UTF-8 /opt/chef/embedded/bin/berks vendor /etc/chef/cookbooks --delete || error_exit 'Vendoring cookbook failed.'\n",
-                  "    done;\n",
-                  "  export HOME=${HOME_BAK}\n",
+                  "  done;\n",
+                  "  export HOME=\"${HOME_BAK}\"\n",
                   "}\n",
                   "function bootstrap_instance\n",
                   "{\n",
@@ -2953,7 +2953,7 @@
                   "  if [ \"${apt}\" == \"0\" ]; then\n",
                   "    apt-cache search build-essential; apt-get clean; apt-get update; apt-get -y install build-essential curl wget jq python-setuptools awscli\n",
                   "  fi\n",
-                  "  [[ ${_region} =~ ^cn- ]] && s3_url=\"cn-north-1.amazonaws.com.cn/cn-north-1-aws-parallelcluster\"",
+                  "  [[ ${_region} =~ ^cn- ]] && s3_url=\"cn-north-1.amazonaws.com.cn/cn-north-1-aws-parallelcluster\"\n",
                   "  which cfn-init 2>/dev/null || ( curl -s -L -o /tmp/aws-cfn-bootstrap-latest.tar.gz https://s3.${s3_url}/cloudformation-examples/aws-cfn-bootstrap-latest.tar.gz; easy_install -U /tmp/aws-cfn-bootstrap-latest.tar.gz)\n",
                   "  mkdir -p /etc/chef && chown -R root:root /etc/chef\n",
                   "  curl --retry 3 -L https://www.chef.io/chef/install.sh | bash -s -- -v ${chef_version}\n",