diff options
| -rw-r--r-- | download.sh | 18 | ||||
| -rw-r--r-- | functions.sh | 19 |
2 files changed, 20 insertions, 17 deletions
diff --git a/download.sh b/download.sh index 4e3c794..2cec438 100644 --- a/download.sh +++ b/download.sh @@ -2,22 +2,6 @@ # Downlod Packages and Patches -download() -{ - tput civis - local url=$1 - echo -n " " - wget -nc -q --show-progress --progress=dot "$url" 2>&1 | grep --line-buffered "%" | \ - sed -u -e "s,\.,,g" | awk '{printf("\b\b\b\b%4s", $2)}' - local retval="${PIPESTATUS[0]}" - if [ "${retval}" -ne 0 ]; then - printf "%b" "${RED}FAILED! WGET EXIT (${retval})\n${RST}" - exit "${retval}" - fi - printf "%b" "\b\b\b\b\n" - tput cnorm -} - cat packages.csv patches.csv | while read -r line; do #NAME="$(echo "$line" | cut -d\, -f1)" VERSION="$(echo "$line" | cut -d\, -f2)" @@ -32,7 +16,7 @@ cat packages.csv patches.csv | while read -r line; do download "${URL}" if ! echo "${MD5SUM} ${LFS}/sources/${CACHEFILE}" | md5sum -c > /dev/null 2>&1; then rm -f "${LFS}/sources/${CACHEFILE}" - printf "%b" "\n${GRN}Verification of ${YLW}${CACHEFILE} ${RED}FAILED! MD5 MISMATCH!${RST}\n" + printf "%b" "${GRN}Verification of ${YLW}${CACHEFILE} ${RED}FAILED! MD5 MISMATCH!${RST}\n" exit 1 fi fi diff --git a/functions.sh b/functions.sh new file mode 100644 index 0000000..d2ff5be --- /dev/null +++ b/functions.sh @@ -0,0 +1,19 @@ +#!/bin/bash + +download() +{ + tput civis + local url=$1 + echo -n " " + wget -nc -q --show-progress --progress=dot "$url" 2>&1 | grep --line-buffered "%" | \ + sed -u -e "s,\.,,g" | awk '{printf("\b\b\b\b%4s", $2)}' + local retval="${PIPESTATUS[0]}" + if [ "${retval}" -ne 0 ]; then + printf "%b" "${RED}FAILED! WGET EXIT (${retval})\n${RST}" + exit "${retval}" + fi + printf "%b" "\b\b\b\b\n" + tput cnorm +} + +export -f download |