opendev/gerrit
Code Issues Proposed changes

Deployment script: Fix verbosity check condition

Browse Source 
Current version was always true. Simplify it and make it actually work.
The check for unset variables is not needed also, because the generated
script doesn't have any, except $VERBOSE that must not be set.

TEST PLAN:

Verify that there is no noise (verbose output) from:

  $ ./tools/maven/api.sh install bazel
  $ ./tools/maven/api.sh install buck

Verify that there is verbose output from:

  $ VERBOSE=1 ./tools/maven/api.sh install bazel
  $ VERBOSE=1 ./tools/maven/api.sh install buck

Change-Id: I1cd0f4cadfa9cec0217c9bd76f5170c396aa3a12
This commit is contained in:
David Ostrovsky 2016-11-03 20:07:09 +01:00 committed by David Pursehouse
parent 8221c2f7f7
commit 6b33042bf8
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/maven/package.bzl
View File

@ -13,10 +13,10 @@
# limitations under the License.
sh_bang_template = (' && '.join([
"echo '#!/bin/bash -eu' > $@",
"echo '#!/bin/bash -e' > $@",
'echo "# this script should run from the root of your workspace." >> $@',
'echo "" >> $@',
"echo 'if [[ -n \"$$$${VERBOSE:-}\" ]]; then set -x ; fi' >> $@",
"echo 'if [[ \"$$VERBOSE\" ]]; then set -x ; fi' >> $@",
'echo "" >> $@',
'echo %s >> $@',
'echo "" >> $@',

4
tools/maven/package.defs
View File

@ -13,10 +13,10 @@
# limitations under the License.
sh_bang_template = (' && '.join([
"echo '#!/bin/bash -eu' > $OUT",
"echo '#!/bin/bash -e' > $OUT",
'echo "# this script should run from the root of your workspace." >> $OUT',
'echo "" >> $OUT',
"echo 'if [[ -n \"$${VERBOSE:-}\" ]]; then set -x ; fi' >> $OUT",
"echo 'if [[ \"${VERBOSE}\" ]]; then set -x ; fi' >> $OUT",
'echo "" >> $OUT',
'echo %s >> $OUT',
'echo "" >> $OUT',