From b685ee1fe02a0f0c7d271d16843cb4282c0dc738 Mon Sep 17 00:00:00 2001
From: Patrick McDermott <patrick.mcdermott@libiquity.com>
Date: Mon, 04 Jan 2021 17:09:28 -0500
Subject: package_get_name_and_version(): Also get dist

---
(limited to 'src')

diff --git a/src/cmd/build.sh b/src/cmd/build.sh
index f7d6716..dab9964 100644
--- a/src/cmd/build.sh
+++ b/src/cmd/build.sh
@@ -112,6 +112,7 @@ cmd_build_main()
 	local arg=
 	local source=
 	local version=
+	local dist=
 	local log=
 	local es=
 
@@ -179,8 +180,8 @@ cmd_build_main()
 		return 2
 	fi
 
-	read -r source version <<-EOF
-		$(package_get_name_and_version)
+	read -r source version dist <<-EOF
+		$(package_get_name_version_dist)
 		EOF
 	log="${_cmd_build_pkg_dir}/../$(: \
 		)${source}_${version}_${host_arch}_${host_plat}.log"
diff --git a/src/package.sh b/src/package.sh
index f869eef..f93190c 100644
--- a/src/package.sh
+++ b/src/package.sh
@@ -45,9 +45,9 @@ package_init()
 	return 0
 }
 
-package_get_name_and_version()
+package_get_name_version_dist()
 {
-	"package_${_package_format}_get_name_and_version"
+	"package_${_package_format}_get_name_version_dist"
 }
 
 package_get_build_deps()
diff --git a/src/package/2.sh b/src/package/2.sh
index 18e5a85..98c5390 100644
--- a/src/package/2.sh
+++ b/src/package/2.sh
@@ -20,10 +20,10 @@
 
 _package_2_build_deps=
 
-_package_2_get_name_and_version()
+package_2_get_name_version_dist()
 {
 	# The first line is all we need to parse.
-	sed '1{ s/^\([^ ][^ ]*\) (\([^)][^)]*\)).*$/\1 \2/; q; };' \
+	sed '1{ s/^\([^ ][^ ]*\) (\([^)][^)]*\)) \(.*\)$/\1 \2 \3/; q; };' \
 		"${package_dir}/changelog"
 
 	return 0
--
cgit v0.9.1