Merge pull request #1220 from common-workflow-language/jenkins_samever_badge

jenkins: allow creating badges for already tested versions

Author: mr-c

jenkins.bash

@@ -38,14 +38,14 @@ do
 	if [[ "$version" = "v1.0" ]]
 	then
 		DRAFT="DRAFT=v1.0"
-		pushd common-workflow-language-master
+		pushd common-workflow-language-master || exit 1
 	else
-		pushd cwl-v1.1-master
+		pushd cwl-v1.1-master || exit 1
 	fi
 	rm -f .coverage* coverage.xml
 	source=$(realpath ../cwltool)
 	COVERAGE_RC=${PWD}/.coveragerc
-	cat > ${COVERAGE_RC} <<EOF
+	cat > "${COVERAGE_RC}" <<EOF
 [run]
 branch = True
 source = ${source}
@@ -61,12 +61,12 @@ omit =
     tests/*
 EOF
 	CWLTOOL_WITH_COV=${PWD}/cwltool_with_cov${PYTHON_VERSION}
-	cat > ${CWLTOOL_WITH_COV} <<EOF
+	cat > "${CWLTOOL_WITH_COV}" <<EOF
 #!/bin/bash
 coverage run --parallel-mode --rcfile=${COVERAGE_RC} \
-	"$(which cwltool)" "\$@"
+	"$(command -v cwltool)" "\$@"
 EOF
-	chmod a+x ${CWLTOOL_WITH_COV}
+	chmod a+x "${CWLTOOL_WITH_COV}"
 	EXTRA="--parallel"
 	# shellcheck disable=SC2154
 	if [[ "$version" = *dev* ]]
@@ -84,7 +84,7 @@ EOF
 	if [ "$GIT_BRANCH" = "origin/master" ] && [[ "$version" = "v1.0" ]] && [[ "$CONTAINER" = "docker" ]] && [ $PYTHON_VERSION -eq 3 ]
 	then
 		rm -Rf conformance
-		git clone http://${jenkins_cwl_conformance}@github.com/common-workflow-language/conformance.git
+		git clone http://"${jenkins_cwl_conformance}"@github.com/common-workflow-language/conformance.git
 
 		git -C conformance config user.email "[email protected]"
 		git -C conformance config user.name "CWL Jenkins build bot"
@@ -98,7 +98,8 @@ EOM
 
 		tool_ver=$(cwltool --version | awk '{ print $2 }')
 		badgedir=${PWD}/conformance/cwltool/cwl_${version}/cwltool_${tool_ver}
-		mkdir -p ${PWD}/conformance/cwltool/cwl_${version}/
+		mkdir -p "${PWD}"/conformance/cwltool/cwl_"${version}"/
+		rm -fr "${badgedir}"
 		BADGE=" --badgedir=${badgedir}"
 	fi
 	# shellcheck disable=SC2086