diff options
Diffstat (limited to 'packageinstall.sh')
| -rw-r--r-- | packageinstall.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/packageinstall.sh b/packageinstall.sh index dee9f2c..f8e71c4 100644 --- a/packageinstall.sh +++ b/packageinstall.sh @@ -4,7 +4,7 @@ set -e 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 @@ -13,7 +13,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}")" |