- Disabled the "Cleanup" step of the build. - Fine tuned the Jenkinsfile to run "sonar" and "site-generation" only on the develop branch. - Fixed some warnings in the get-edgent-jars.sh script
Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/commit/3ed00490 Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/tree/3ed00490 Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/diff/3ed00490 Branch: refs/heads/develop Commit: 3ed0049089df8deb42cfa50744ffa6a18adfaed7 Parents: 2b267b2 Author: Christofer Dutz <christofer.d...@c-ware.de> Authored: Sun Nov 5 16:01:21 2017 +0100 Committer: Christofer Dutz <christofer.d...@c-ware.de> Committed: Sun Nov 5 16:01:21 2017 +0100 ---------------------------------------------------------------------- get-edgent-jars-project/get-edgent-jars.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/3ed00490/get-edgent-jars-project/get-edgent-jars.sh ---------------------------------------------------------------------- diff --git a/get-edgent-jars-project/get-edgent-jars.sh b/get-edgent-jars-project/get-edgent-jars.sh index a8c50f7..8d0c5ce 100755 --- a/get-edgent-jars-project/get-edgent-jars.sh +++ b/get-edgent-jars-project/get-edgent-jars.sh @@ -120,7 +120,7 @@ function confirm () { # [$1: question] # call with a prompt string or use a default /bin/echo -n "${1:-Are you sure?}" read -r -p " [y/n] " response - case $response in + case ${response} in [yY]) return `true` ;; [nN]) return `false` ;; *) echo "illegal response '$response'" ;; @@ -136,7 +136,7 @@ mkdir -p target DEP_DECLS_FILE=target/tmp-dep-decls rm -f ${DEP_DECLS_FILE} for i in ${ARTIFACT_GAVS}; do - echo $i | awk -F : '{ type=""; if ($3 == "{EV}") $3="${edgent.runtime.version}"; if ($4 != "") type=" <type>" $4 "</type>\n"; printf "<dependency>\n <groupId>%s</groupId>\n <artifactId>%s</artifactId>\n <version>%s</version>\n%s</dependency>\n", $1, $2, $3, type }' >> ${DEP_DECLS_FILE} + echo ${i} | awk -F : '{ type=""; if ($3 == "{EV}") $3="${edgent.runtime.version}"; if ($4 != "") type=" <type>" $4 "</type>\n"; printf "<dependency>\n <groupId>%s</groupId>\n <artifactId>%s</artifactId>\n <version>%s</version>\n%s</dependency>\n", $1, $2, $3, type }' >> ${DEP_DECLS_FILE} done DEP_DECLS=`cat ${DEP_DECLS_FILE}`
