X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=shell%2Fjenkins-configure-global-vars.sh;h=86b1bcded5c5fa63cb92f96ac4fc617b49da3024;hb=eafdcafcbe25dbad05e5117aca20bf6ea048ac44;hp=af36d100466fa886171deb16a87e8a3b585487a5;hpb=4e9ff649abbfc5dde3125880bae9f71f02971c8f;p=releng%2Fglobal-jjb.git

diff --git a/shell/jenkins-configure-global-vars.sh b/shell/jenkins-configure-global-vars.sh
index af36d100..86b1bcde 100644
--- a/shell/jenkins-configure-global-vars.sh
+++ b/shell/jenkins-configure-global-vars.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -l
 # SPDX-License-Identifier: EPL-1.0
 ##############################################################################
 # Copyright (c) 2018 The Linux Foundation and others.
@@ -18,10 +18,8 @@
 #                     configuration to. (default: jenkins)
 echo "---> jenkins-configure-global-vars.sh"
 
-GROOVY_SCRIPT_FILE="jjb/global-jjb/jenkins-admin/set_global_properties.groovy"
+GROOVY_SCRIPT_FILE="global-jjb/jenkins-admin/set_global_properties.groovy"
 
-# shellcheck source=/tmp/v/lftools/bin/activate disable=SC1091
-source "/tmp/v/lftools/bin/activate"
 silos="${jenkins_silos:-jenkins}"
 
 set -eu -o pipefail
@@ -30,7 +28,10 @@ for silo in $silos; do
     if [ ! -f "$WORKSPACE/jenkins-config/global-vars-$silo.sh" ]; then
         echo "WARN: jenkins-config/global-vars-$silo.sh does not exist. Skipping cloud management..."
         echo "We highly recommend setting up global-vars-$silo.sh to manage the Jenkins global variables."
-        echo "Refer to https://docs.releng.linuxfoundation.org/projects/global-jjb/en/latest/jjb/lf-ci-jobs.html#global-environment-variables for details."
+        # shellcheck disable=SC2140
+        echo "Refer to https://docs.releng.linuxfoundation.org/"\
+"projects/global-jjb/en/latest/jjb/lf-ci-jobs.html"\
+"#global-environment-variables for details."
         continue
     fi
 
@@ -51,7 +52,7 @@ for silo in $silos; do
         exit 1
     fi
 
-    mapfile -t vars < <(cat $global_vars)
+    mapfile -t vars < <(cat "$global_vars")
 
     rm -f insert.txt
     for var in "${vars[@]}"; do
@@ -60,8 +61,8 @@ for silo in $silos; do
             continue
         fi
 
-        key=$(echo $var | cut -d\= -f1)
-        value=$(echo $var | cut -d\= -f2)
+        key=$(echo "$var" | cut -d= -f1)
+        value=$(echo "$var" | cut -d= -f2)
         echo "    '$key': '$value'," >> insert.txt
     done