summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeah Rowe <leah@libreboot.org>2024-05-15 04:02:48 +0100
committerLeah Rowe <leah@libreboot.org>2024-05-15 04:03:16 +0100
commitc6ba0a0e9b297606e89bd82655e48c40ac01becc (patch)
tree9ee834c5b7a516c9ccf4e7285d2ab351ff10b53c
parent313c4c01e0ec22eb2c2872baa4a116428d136339 (diff)
option.sh: delete check_git()
it's only used from main() in the main build script, and it's very small, as is main() therefore, move the logic into main() Signed-off-by: Leah Rowe <leah@libreboot.org>
-rwxr-xr-xbuild9
-rwxr-xr-xinclude/option.sh10
2 files changed, 8 insertions, 11 deletions
diff --git a/build b/build
index 3a345e11..2d95a500 100755
--- a/build
+++ b/build
@@ -29,7 +29,14 @@ main()
[ "$1" = "dependencies" ] && x_ install_packages $@ && lbmk_exit 0
- for cmd in initcmd check_git git_init excmd; do
+ which git 1>/dev/null 2>/dev/null || \
+ git_err "git not installed. please install git-scm."
+ git config --global user.name 1>/dev/null 2>/dev/null || \
+ git_err "git config --global user.name \"John Doe\""
+ git config --global user.email 1>/dev/null 2>/dev/null || \
+ git_err "git config --global user.email \"john.doe@example.com\""
+
+ for cmd in initcmd git_init excmd; do
eval "${cmd} \$@"
done
lbmk_exit 0
diff --git a/include/option.sh b/include/option.sh
index 986e0883..26867772 100755
--- a/include/option.sh
+++ b/include/option.sh
@@ -152,16 +152,6 @@ remkdir()
mkdir -p "${1}" || $err "remkdir: !mkdir -p \"${1}\""
}
-check_git()
-{
- which git 1>/dev/null 2>/dev/null || \
- git_err "git not installed. please install git-scm."
- git config --global user.name 1>/dev/null 2>/dev/null || \
- git_err "git config --global user.name \"John Doe\""
- git config --global user.email 1>/dev/null 2>/dev/null || \
- git_err "git config --global user.email \"john.doe@example.com\""
-}
-
git_err()
{
printf "You need to set git name/email, like so:\n%s\n\n" "$1" 1>&2