summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeah Rowe <leah@libreboot.org>2023-08-24 16:37:40 +0100
committerLeah Rowe <leah@libreboot.org>2023-08-24 16:37:40 +0100
commit50c395df59564c19d3a24262810c8dd5ed115db5 (patch)
treea563d3f18c662180fe4b153291c6a5b88203c979
parentbe7a5b0ca24d08158ec22b6e487301c6b164eadb (diff)
.gitcheck: continue if no .git (don't break)
the user may have re-downloaded a coreboot tree, in a release. this is supported. therefore, some may have .git, and some will not Signed-off-by: Leah Rowe <leah@libreboot.org>
-rwxr-xr-x.gitcheck4
-rwxr-xr-xlbmk7
2 files changed, 6 insertions, 5 deletions
diff --git a/.gitcheck b/.gitcheck
index 8a2b5a90..0e5df8bd 100755
--- a/.gitcheck
+++ b/.gitcheck
@@ -29,7 +29,7 @@ set_placeholders()
[ -d coreboot ] || return 0
for x in coreboot/*; do
[ -d "${x}" ] || continue
- [ -e "${x}/.git" ] || break
+ [ -e "${x}/.git" ] || continue
(
cd "${x}"
set_git_credentials
@@ -55,7 +55,7 @@ clean()
[ -d coreboot ] || return 0
for x in coreboot/*; do
[ -d "${x}" ] || continue
- [ -e "${x}/.git" ] || break
+ [ -e "${x}/.git" ] || continue
(
cd "${x}"
unset_placeholders
diff --git a/lbmk b/lbmk
index cab3d4bd..e0933aa9 100755
--- a/lbmk
+++ b/lbmk
@@ -37,11 +37,12 @@ main()
[ $# -lt 1 ] && err "Too few arguments. Try: ${0} help"
buildpath="./resources/scripts/${0##*/}"
-
mode="${1}"
- ./.gitcheck
+
+ ./.gitcheck || err "/.gitcheck call from main, in /lbmk"
[ "${mode}" = "help" ] && usage ${0} && exit 0
[ $# -lt 2 ] && usage ${0} && exit 1
+
if [ "${mode}" = "dependencies" ]; then
install_dependencies $@ || err "Could not install dependencies"
exit 0
@@ -73,7 +74,7 @@ main()
"${buildpath}/${mode}/${option}" $@ || err "lbmk error"
esac
- ./.gitcheck clean
+ ./.gitcheck clean || err "/.gitcheck clean call from main, in /lbmk"
}
install_dependencies()