aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGunnar Andersson <gandersson@genivi.org>2018-10-31 17:58:16 +0100
committerGunnar Andersson <gandersson@genivi.org>2018-10-31 18:06:07 +0100
commit13f502d06ef7732dc5f7c5de767141450496e4f6 (patch)
treebd760b78379bf7b47a8fbfb38fcf3918f102c036
parentba8341892ff3ad6ec49fd76a48a529681585ee47 (diff)
downloadmeta-ivi-13f502d06ef7732dc5f7c5de767141450496e4f6.tar.gz
meta-ivi-13f502d06ef7732dc5f7c5de767141450496e4f6.tar.bz2
meta-ivi-13f502d06ef7732dc5f7c5de767141450496e4f6.zip
ci-build.sh: Fix bug in append local confHEADmaster
Not sure how this ever worked before. Some comments / cosmetic changes were included in the process. Signed-off-by: Gunnar Andersson <gandersson@genivi.org>
-rwxr-xr-xscripts/ci-build.sh8
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/ci-build.sh b/scripts/ci-build.sh
index bfd4783..d936fa4 100755
--- a/scripts/ci-build.sh
+++ b/scripts/ci-build.sh
@@ -66,7 +66,7 @@ stop_immediately() {
append_local_conf() {
LOCAL_CONF="$BASEDIR/build/conf/local.conf"
if [[ -f "$LOCAL_CONF" ]]; then
- if fgrep -q "$1" ; then
+ if fgrep -q "$1" "$LOCAL_CONF" ; then
echo "Found variable ($1) in local conf - skipping append"
else
echo -n "Appending to local.conf: "
@@ -450,8 +450,8 @@ fi
# this format makes it similar to the $MIRROR setup below, which needs to be
# explicit anyhow.
-# We *pre*pend PREMIRROR because we want it to be the first PREMIRROR that
-# is checked, if the user had defined any other in conf files.
+# We *pre*pend PREMIRROR because we want it to be the first mirror that is
+# checked, if the user has defined any other in conf files.
if [[ -n "$PREMIRROR" ]]; then
append_local_conf PREMIRRORS_prepend "
@@ -465,7 +465,7 @@ fi
# This is the "post" mirror (i.e. checked last).
# WE *app*pend MIRROR because we want it to be the last mirror that is checked,
-# if the user had defined others in conf files.
+# if the user has defined others in conf files.
if [[ -n "$MIRROR" ]]; then
append_local_conf MIRRORS_append "
MIRRORS_append = \"\\