From 33e6088a167fefe65e4c246e2fd6cce69372799f Mon Sep 17 00:00:00 2001
From: Leah Rowe <leah@libreboot.org>
Date: Mon, 4 Sep 2023 03:28:11 +0100
Subject: move script/misc/versioncheck to main directory

Signed-off-by: Leah Rowe <leah@libreboot.org>
---
 checkversion             | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
 lbmk                     |  3 +--
 script/misc/versioncheck | 48 ------------------------------------------------
 3 files changed, 49 insertions(+), 50 deletions(-)
 create mode 100755 checkversion
 delete mode 100755 script/misc/versioncheck

diff --git a/checkversion b/checkversion
new file mode 100755
index 00000000..6ee683ee
--- /dev/null
+++ b/checkversion
@@ -0,0 +1,48 @@
+#!/usr/bin/env sh
+
+#	Copyright (C) 2021 Leah Rowe <info@minifree.org>
+#
+#	This program is free software: you can redistribute it and/or modify
+#	it under the terms of the GNU General Public License as published by
+#	the Free Software Foundation, either version 3 of the License, or
+#	(at your option) any later version.
+#
+#	This program is distributed in the hope that it will be useful,
+#	but WITHOUT ANY WARRANTY; without even the implied warranty of
+#	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#	GNU General Public License for more details.
+#
+#	You should have received a copy of the GNU General Public License
+#	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+[ "x${DEBUG+set}" = 'xset' ] && set -v
+set -u
+
+. "include/err.sh"
+
+read project < projectname
+
+version="version-unknown"
+[ -f version ] && read version < version
+version_="${version}"
+if [ -e ".git" ]; then
+	version="$(git describe --tags HEAD 2>&1)" || \
+	    version="git-$(git rev-parse HEAD 2>&1)" || \
+	    version="${version_}"
+	printf "%s\n" "${version}" > version
+fi
+
+versiondate="version-date-unknown"
+[ -f versiondate ] && read versiondate < versiondate
+versiondate_="${versiondate}"
+if [ -e ".git" ]; then
+	versiondate="$(git show --no-patch --no-notes --pretty='%ct' HEAD)" || \
+	    versiondate="${versiondate_}"
+	printf "%s\n" "${versiondate}" > versiondate
+fi
+
+if [ "${versiondate}" = "version-date-unknown" ] || \
+    [ "${version}" = "version-unknown" ]; then
+	err "cannot determine ${projectname} revision"
+fi
diff --git a/lbmk b/lbmk
index 04f52a99..3abbd470 100755
--- a/lbmk
+++ b/lbmk
@@ -68,8 +68,7 @@ main()
 	option="${2}"
 	shift 2
 
-	./script/misc/versioncheck || \
-	    fail "Cannot check lbmk version"
+	./checkversion || fail "Cannot check lbmk version"
 
 	case "${option}" in
 	list)
diff --git a/script/misc/versioncheck b/script/misc/versioncheck
deleted file mode 100755
index 6ee683ee..00000000
--- a/script/misc/versioncheck
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/usr/bin/env sh
-
-#	Copyright (C) 2021 Leah Rowe <info@minifree.org>
-#
-#	This program is free software: you can redistribute it and/or modify
-#	it under the terms of the GNU General Public License as published by
-#	the Free Software Foundation, either version 3 of the License, or
-#	(at your option) any later version.
-#
-#	This program is distributed in the hope that it will be useful,
-#	but WITHOUT ANY WARRANTY; without even the implied warranty of
-#	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#	GNU General Public License for more details.
-#
-#	You should have received a copy of the GNU General Public License
-#	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-
-[ "x${DEBUG+set}" = 'xset' ] && set -v
-set -u
-
-. "include/err.sh"
-
-read project < projectname
-
-version="version-unknown"
-[ -f version ] && read version < version
-version_="${version}"
-if [ -e ".git" ]; then
-	version="$(git describe --tags HEAD 2>&1)" || \
-	    version="git-$(git rev-parse HEAD 2>&1)" || \
-	    version="${version_}"
-	printf "%s\n" "${version}" > version
-fi
-
-versiondate="version-date-unknown"
-[ -f versiondate ] && read versiondate < versiondate
-versiondate_="${versiondate}"
-if [ -e ".git" ]; then
-	versiondate="$(git show --no-patch --no-notes --pretty='%ct' HEAD)" || \
-	    versiondate="${versiondate_}"
-	printf "%s\n" "${versiondate}" > versiondate
-fi
-
-if [ "${versiondate}" = "version-date-unknown" ] || \
-    [ "${version}" = "version-unknown" ]; then
-	err "cannot determine ${projectname} revision"
-fi
-- 
cgit v1.2.1