From 7092d5d0f8467dc5736de1ef393740e822276718 Mon Sep 17 00:00:00 2001 From: William Harrington Date: Mon, 5 Apr 2021 20:57:48 -0500 Subject: Remove lines for testing. --- packageinstall.sh | 3 --- 1 file changed, 3 deletions(-) diff --git a/packageinstall.sh b/packageinstall.sh index 88876ac..c9689a6 100644 --- a/packageinstall.sh +++ b/packageinstall.sh @@ -18,9 +18,6 @@ else CACHEFILE="$(basename "${URL}")" DIRNAME="$(tar -tf "${CACHEFILE}" | sed -e 's@/.*@@' | uniq)" - echo $NAME - exit 1 - # Remove existing if exists rm -rf "${DIRNAME}" -- cgit v1.2.3-54-g00ecf From eb687642db67caf1ae9658f3cc2ab31582f0e2a2 Mon Sep 17 00:00:00 2001 From: William Harrington Date: Mon, 5 Apr 2021 21:02:08 -0500 Subject: Have grep exit 0 without stdoutput when checking if a package is in packages.csv. --- packageinstall.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packageinstall.sh b/packageinstall.sh index c9689a6..48d93e4 100644 --- a/packageinstall.sh +++ b/packageinstall.sh @@ -3,7 +3,7 @@ CHAPTER="$1" PACKAGE="$2" -if ! grep "^${PACKAGE}" packages.csv; then +if ! grep "^${PACKAGE}" packages.csv >/dev/null 2>&1; then printf "%b" " ${IRED}PACKAGE ${IYLW}${PACKAGE} ${IRED}DOES NOT EXIST!${RST}\n" exit 1 fi -- cgit v1.2.3-54-g00ecf From ed77f4657d7575dc770fdc9e05db6908d46062fa Mon Sep 17 00:00:00 2001 From: William Harrington Date: Mon, 5 Apr 2021 21:02:45 -0500 Subject: Have grep exit 0 without stdoutput when checking if a package is in packages.csv. --- packageinstall.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packageinstall.sh b/packageinstall.sh index 48d93e4..78e2cdd 100644 --- a/packageinstall.sh +++ b/packageinstall.sh @@ -3,7 +3,7 @@ CHAPTER="$1" PACKAGE="$2" -if ! grep "^${PACKAGE}" packages.csv >/dev/null 2>&1; then +if ! grep -q "^${PACKAGE}" packages.csv; then printf "%b" " ${IRED}PACKAGE ${IYLW}${PACKAGE} ${IRED}DOES NOT EXIST!${RST}\n" exit 1 fi -- cgit v1.2.3-54-g00ecf