Skip to content

Commit 473b72f

Browse files
author
Damian Rouson
committed
install.sh now detects present GCC branch tar ball
1 parent 1be1382 commit 473b72f

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

prerequisites/build-functions/download_if_necessary.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,8 @@ download_if_necessary()
6868
;;
6969
esac
7070

71-
if [[ -f "${download_path}/${url_tail}" || -d "${download_path}/${url_tail}" ]] ; then
72-
info "Found '${url_tail}' in ${download_path}."
71+
if [[ -f "${download_path}/${url_tail}" || -d "${download_path}/${url_tail##*branches/}" ]]; then
72+
info "Found '${url_tail##*branches/}' in ${download_path}."
7373
info "If it resulted from an incomplete download, building ${package_name} could fail."
7474
if [[ "${arg_y}" == "${__flag_present}" ]]; then
7575
info "-y or --yes-to-all flag present. Proceeding with non-interactive build."
@@ -78,7 +78,7 @@ download_if_necessary()
7878
read -r proceed
7979
if [[ "${proceed}" == "n" || "${proceed}" == "N" || "${proceed}" == "no" ]]; then
8080
info "n"
81-
info "Please remove $url_tail and restart the installation to to ensure a fresh download." 1>&2
81+
info "Please remove ${url_tail##*branches/} and restart the installation to to ensure a fresh download." 1>&2
8282
emergency "Aborting. [exit 80]"
8383
else
8484
info "y"

0 commit comments

Comments
 (0)