Skip to content

Commit 9f82c56

Browse files
authored
Merge pull request #4 from bashpack-project/working
improve downloading errors
2 parents a2d6304 + 9bfebb8 commit 9f82c56

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

bashpack.sh

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -152,12 +152,12 @@ export -f exists_command
152152

153153

154154
# Error function.
155-
# Usage : error_file_not_downloaded <file> <file_url>
155+
# Usage : error_file_not_downloaded <file_url>
156156
error_file_not_downloaded() {
157-
local file=${1}
158-
local file_url=${2}
159-
160-
echo "Error: $file not found. Can you reach $file_url ?"
157+
echo ""
158+
echo "Error: ${1} not found."
159+
echo "Are curl or wget able to reach it from your system?"
160+
echo ""
161161
}
162162

163163

@@ -309,7 +309,7 @@ download_cli() {
309309

310310
#local archive_name="$NAME_LOWERCASE-${1}.tar.gz" # for basic web server
311311
#local archive_url="$URL/$archive_name" # for basic web server
312-
local archive_url=${1} # for Github
312+
local archive_url=${1} # for Github taball
313313

314314

315315
# Prepare tmp directory
@@ -334,7 +334,7 @@ download_cli() {
334334
archive_extract $archive_tmp $archive_dir_tmp
335335

336336
else
337-
error_file_not_downloaded $archive_name $archive_url
337+
error_file_not_downloaded $archive_url
338338
fi
339339
}
340340

@@ -440,7 +440,7 @@ create_cli() {
440440
rm -rf $archive_dir_tmp
441441

442442
else
443-
error_file_not_downloaded $archive_tmp $archive_url
443+
error_file_not_downloaded $archive_url
444444
fi
445445
}
446446

0 commit comments

Comments
 (0)