From commits-return-1283-archive-asf-public=cust-asf.ponee.io@yetus.apache.org Mon Mar 11 15:35:47 2019 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id AAFA8180657 for ; Mon, 11 Mar 2019 16:35:46 +0100 (CET) Received: (qmail 53678 invoked by uid 500); 11 Mar 2019 15:35:45 -0000 Mailing-List: contact commits-help@yetus.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@yetus.apache.org Delivered-To: mailing list commits@yetus.apache.org Received: (qmail 53668 invoked by uid 99); 11 Mar 2019 15:35:45 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 11 Mar 2019 15:35:45 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 3F70E879BA; Mon, 11 Mar 2019 15:35:45 +0000 (UTC) Date: Mon, 11 Mar 2019 15:35:45 +0000 To: "commits@yetus.apache.org" Subject: [yetus] branch master updated: YETUS-817. upgrade to shellcheck 0.6.0 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <155231854515.26534.18313318643746054655@gitbox.apache.org> From: aw@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: yetus X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 136f4e240c4a6d08abbd6239fb5f98c7f17eea98 X-Git-Newrev: e28ec292f195c404be7d453f2e9b1817a0d7e7a5 X-Git-Rev: e28ec292f195c404be7d453f2e9b1817a0d7e7a5 X-Git-NotificationType: ref_changed_plus_diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated This is an automated email from the ASF dual-hosted git repository. aw pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/yetus.git The following commit(s) were added to refs/heads/master by this push: new e28ec29 YETUS-817. upgrade to shellcheck 0.6.0 e28ec29 is described below commit e28ec292f195c404be7d453f2e9b1817a0d7e7a5 Author: Allen Wittenauer AuthorDate: Sun Mar 10 11:34:36 2019 -0700 YETUS-817. upgrade to shellcheck 0.6.0 Signed-off-by: Sean Busbey --- precommit/src/main/shell/test-patch-docker/Dockerfile | 6 ++++-- precommit/src/main/shell/test-patch.d/maven.sh | 2 +- precommit/src/test/shell/run-bats.sh | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/precommit/src/main/shell/test-patch-docker/Dockerfile b/precommit/src/main/shell/test-patch-docker/Dockerfile index acac18b..138aa03 100644 --- a/precommit/src/main/shell/test-patch-docker/Dockerfile +++ b/precommit/src/main/shell/test-patch-docker/Dockerfile @@ -199,10 +199,12 @@ ENV BUNDLE_PATH /var/tmp/.bundler-gems #### # Install shellcheck (shell script lint) #### -RUN add-apt-repository -y ppa:jonathonf/ghc-8.0.2 -RUN apt-get -q update && apt-get -q install --no-install-recommends -y shellcheck \ +RUN apt-get -q update && apt-get -q install --no-install-recommends -y cabal-install \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* +RUN cabal update +RUN cabal install ShellCheck \ + && cp -p /root/.cabal/bin/shellcheck /usr/local/bin/shellcheck ### # Install hadolint diff --git a/precommit/src/main/shell/test-patch.d/maven.sh b/precommit/src/main/shell/test-patch.d/maven.sh index 09c7064..64fbcc2 100755 --- a/precommit/src/main/shell/test-patch.d/maven.sh +++ b/precommit/src/main/shell/test-patch.d/maven.sh @@ -538,7 +538,7 @@ function maven_unit_test_filter() { declare filtered - if [[ ! -z "${UNIT_TEST_FILTER_FILE}" ]]; then + if [[ -n "${UNIT_TEST_FILTER_FILE}" ]]; then while read -r line || [[ -n "${line}" ]]; do if [[ -z $line ]]; then continue diff --git a/precommit/src/test/shell/run-bats.sh b/precommit/src/test/shell/run-bats.sh index 566f47a..24ea79e 100755 --- a/precommit/src/test/shell/run-bats.sh +++ b/precommit/src/test/shell/run-bats.sh @@ -17,7 +17,7 @@ targetdir=../../../target mkdir -p ${targetdir}/surefire-reports ${targetdir}/tap -batsexe=$(which bats) 2>/dev/null +batsexe=$(command -v bats) 2>/dev/null if [[ -z ${batsexe} ]]; then echo "not ok - no bats executable found" > "${targetdir}/tap/shelltest.tap"