From 031b2c7f5f356771ac05a582b0393baa92da4c48 Mon Sep 17 00:00:00 2001
From: William Harrington <kb0iic@berzerkula.org>
Date: Wed, 7 Apr 2021 08:39:35 -0500
Subject: Change grep to look for package up until the first comma.
---
packageinstall.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'packageinstall.sh')
diff --git a/packageinstall.sh b/packageinstall.sh
index 78e2cdd..df09148 100644
--- a/packageinstall.sh
+++ b/packageinstall.sh
@@ -3,7 +3,7 @@
CHAPTER="$1"
PACKAGE="$2"
-if ! grep -q "^${PACKAGE}" packages.csv; then
+if ! grep -q "^${PACKAGE}," packages.csv; then
printf "%b" " ${IRED}PACKAGE ${IYLW}${PACKAGE} ${IRED}DOES NOT EXIST!${RST}\n"
exit 1
fi
@@ -12,7 +12,7 @@ if [[ -f "${LFS}/sources/chapter${CHAPTER}/${PACKAGE}" ]]; then
printf "%b" "${GRN}Package ${YLW}${PACKAGE} ${GRN}already built and installed${RST}\n"
else
- grep -i "^${PACKAGE}" packages.csv | grep -i -v "\.patch;" | while read -r line; do
+ grep -i "^${PACKAGE}," packages.csv | grep -i -v "\.patch;" | while read -r line; do
VERSION="$(echo "${line}" | cut -d\, -f2)"
URL="$(echo "${line}" | cut -d\, -f3 | sed "s/@/${VERSION}/g")"
CACHEFILE="$(basename "${URL}")"
--
cgit v1.2.3-54-g00ecf