remove check_project() (always set variables)

in lbmk, we call check_project() to set variables
such as projectname, version, version date

this is unnecessary, because all main scripts use
this functionality anyway

do it by default

Signed-off-by: Leah Rowe <leah@libreboot.org>

1 files changed, 20 insertions, 27 deletions

diff --git a/include/option.sh b/include/option.sh
index 7303287d..986e0883 100755
--- a/include/option.sh
+++ b/include/option.sh
@@ -70,6 +70,26 @@ expr "X$threads" : "X-\{0,1\}[0123456789][0123456789]*$" \
     1>/dev/null 2>/dev/null || threads=1 # user specified a non-integer
 export LBMK_THREADS="$threads"
 
+x_() {
+	[ $# -lt 1 ] || ${@} || $err "Unhandled non-zero exit: $@"; return 0
+}
+
+read -r projectname < projectname || :
+[ ! -f version ] || read -r version < version || :
+version_="${version}"
+[ ! -e ".git" ] || version="$(git describe --tags HEAD 2>&1)" || \
+    version="git-$(git rev-parse HEAD 2>&1)" || version="${version_}"
+[ ! -f versiondate ] || read -r versiondate < versiondate || :
+versiondate_="${versiondate}"
+[ ! -e ".git" ] || versiondate="$(git show --no-patch --no-notes \
+    --pretty='%ct' HEAD)" || versiondate="${versiondate_}"
+for p in projectname version versiondate; do
+	eval "[ -n \"\$$p\" ] || $err \"$p unset\""
+	eval "x_ printf \"%s\\n\" \"\$$p\" > $p"
+done
+relname="${projectname}-${version}"
+export LOCALVERSION="-${projectname}-${version%%-*}"
+
 items()
 {
 	rval=1
@@ -132,10 +152,6 @@ remkdir()
 	mkdir -p "${1}" || $err "remkdir: !mkdir -p \"${1}\""
 }
 
-x_() {
-	[ $# -lt 1 ] || ${@} || $err "Unhandled non-zero exit: $@"; return 0
-}
-
 check_git()
 {
 	which git 1>/dev/null 2>/dev/null || \
@@ -152,29 +168,6 @@ git_err()
 	$err "Git name/email not configured"
 }
 
-check_project()
-{
-	read -r projectname < projectname || :
-
-	[ ! -f version ] || read -r version < version || :
-	version_="${version}"
-	[ ! -e ".git" ] || version="$(git describe --tags HEAD 2>&1)" || \
-	    version="git-$(git rev-parse HEAD 2>&1)" || version="${version_}"
-
-	[ ! -f versiondate ] || read -r versiondate < versiondate || :
-	versiondate_="${versiondate}"
-	[ ! -e ".git" ] || versiondate="$(git show --no-patch --no-notes \
-	    --pretty='%ct' HEAD)" || versiondate="${versiondate_}"
-
-	for p in projectname version versiondate; do
-		eval "[ -n \"\$$p\" ] || $err \"$p unset\""
-		eval "x_ printf \"%s\\n\" \"\$$p\" > $p"
-	done
-
-	relname="${projectname}-${version}"
-	export LOCALVERSION="-${projectname}-${version%%-*}"
-}
-
 mktar_release()
 {
 	printf "%s\n" "${version}" > "${1}/version" || return 1