Merge PR #13644: Fix overlay system: projects need to be loaded befor…

…e overlays. Reviewed-by: gares
coq · Dec 16, 2020 · 41cf9c1 · 41cf9c1
2 parents 88c77bf + faafe8b
commit 41cf9c1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/dev/ci/ci-basic-overlay.sh b/dev/ci/ci-basic-overlay.sh
@@ -7,11 +7,10 @@ declare -a projects # the list of project repos that can be be overlayed
 
 # checks if the given argument is a known project
 function is_in_projects {
-    local rc=1
-    for x in ${projects[@]}; do
-      if [ "$1" = "$x" ]; then rc=0; fi;
+    for x in "${projects[@]}"; do
+      if [ "$1" = "$x" ]; then return 0; fi;
     done
-    return rc
+    return 1
 }
 
 # project <name> <giturl> <ref> [<archiveurl>]

diff --git a/dev/ci/ci-common.sh b/dev/ci/ci-common.sh
@@ -73,14 +73,14 @@ function overlay()
 }
 
 set +x
+# shellcheck source=ci-basic-overlay.sh
+. "${ci_dir}/ci-basic-overlay.sh"
+
 for overlay in "${ci_dir}"/user-overlays/*.sh; do
     # shellcheck source=/dev/null
     # the directoy can be empty
     if [ -e "${overlay}" ]; then . "${overlay}"; fi
 done
-
-# shellcheck source=ci-basic-overlay.sh
-. "${ci_dir}/ci-basic-overlay.sh"
 set -x
 
 # [git_download project] will download [project] and unpack it