diff options
| author |   Gunnar Andersson <gandersson@genivi.org> | 2018-10-31 17:58:16 +0100 |
|---|---|---|
| committer | Gunnar Andersson <gandersson@genivi.org> | 2018-10-31 18:02:08 +0100 |
| commit | 7a452dc9b803912da56e358c7aa3daa7a2bd695f (patch) | |
| tree | 71c859ab258051f0a52e462a641acf6627e055c6 | |
| parent | 2340577fe6b00fb3cd3aebe1fec806fbb08f073c (diff) | |
| download | meta-ivi-14.x-sumo.tar.gz meta-ivi-14.x-sumo.tar.bz2 meta-ivi-14.x-sumo.zip | |
ci-build.sh: Fix bug in append local conf14.x-sumo
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-x | scripts/ci-build.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/ci-build.sh b/scripts/ci-build.sh index a543769..f92fbeb 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 " @@ -466,7 +466,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 = \"\\ |