Code Review
/
releng
/
global-jjb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Update regexp in lf-infra-ship-logs macro
[releng/global-jjb.git]
/
shell
/
jenkins-configure-global-vars.sh
diff --git
a/shell/jenkins-configure-global-vars.sh
b/shell/jenkins-configure-global-vars.sh
index
de45f90
..
1e2f95e
100644
(file)
--- a/
shell/jenkins-configure-global-vars.sh
+++ b/
shell/jenkins-configure-global-vars.sh
@@
-18,10
+18,8
@@
# configuration to. (default: jenkins)
echo "---> jenkins-configure-global-vars.sh"
# 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
silos="${jenkins_silos:-jenkins}"
set -eu -o pipefail
@@
-51,7
+49,7
@@
for silo in $silos; do
exit 1
fi
exit 1
fi
- mapfile -t vars < <(cat
$global_vars
)
+ mapfile -t vars < <(cat
"$global_vars"
)
rm -f insert.txt
for var in "${vars[@]}"; do
rm -f insert.txt
for var in "${vars[@]}"; do
@@
-60,8
+58,8
@@
for silo in $silos; do
continue
fi
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
echo " '$key': '$value'," >> insert.txt
done