Chore: Fix bashate warnings

[releng/global-jjb.git] / shell / common-variables.sh

diff --git a/shell/common-variables.sh b/shell/common-variables.sh
index 7bbc36f..be0a451 100644 (file)
--- a/shell/common-variables.sh
+++ b/shell/common-variables.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -l
 # SPDX-License-Identifier: EPL-1.0
 ##############################################################################
 # Copyright (c) 2017 The Linux Foundation and others.
@@ -8,7 +8,7 @@
 # which accompanies this distribution, and is available at
 # http://www.eclipse.org/legal/epl-v10.html
 ##############################################################################
-
+echo "---> common-variables.sh"
 # This file contains a list of variables that are generally useful in many
 # scripts. It is meant to be sourced in other scripts so that the variables can
 # be called.
@@ -16,14 +16,19 @@
 MAVEN_OPTIONS="$(echo --show-version \
     --batch-mode \
     -Djenkins \
-    -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn \
+    "-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer"\
+".Slf4jMavenTransferListener=warn" \
     -Dmaven.repo.local=/tmp/r \
     -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r)"
 echo "$MAVEN_OPTIONS"
 
 # Activates the lftools virtualenv
 lftools_activate() {
+    echo "WARNING: lftools_activate should no longer be used"\
+        "and will be removed in a future release."
     virtualenv --quiet "/tmp/v/lftools"
+    set +u  # Ignore unbound variables in activate
     # shellcheck source=/tmp/v/lftools/bin/activate disable=SC1091
     source "/tmp/v/lftools/bin/activate"
+    set -u  # Restore unbound variable checking
 }