diff options
Diffstat (limited to 'packageinstall.sh')
| -rw-r--r-- | packageinstall.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/packageinstall.sh b/packageinstall.sh index f8e71c4..af91415 100644 --- a/packageinstall.sh +++ b/packageinstall.sh @@ -1,5 +1,5 @@ #!/bin/bash -set -e +#set -e CHAPTER="$1" PACKAGE="$2" @@ -17,9 +17,9 @@ else VERSION="$(echo "${line}" | cut -d\, -f2)" URL="$(echo "${line}" | cut -d\, -f3 | sed "s/@/${VERSION}/g")" CACHEFILE="$(basename "${URL}")" - DIRNAME="$(tar -tf "${CACHEFILE}" | sed -e 's@/.*@@' | uniq)" + DIRNAME="$(tar -tf "${CACHEFILE}" | sed -e 's@/.*@@' | uniq)" - # Remove existing if exists + # Remove existing if exists rm -rf "${DIRNAME}" printf "%b" "${IBLU}Extracting ${YLW}${CACHEFILE}${RST}... " @@ -44,7 +44,7 @@ else spinner "$pid" "${SPINNER}" retval=$? if [[ "$retval" -ne 0 ]]; then - fail "FAILED!" + fail "FAILED!" popd > /dev/null || return 1 return $retval else |