notwa/rc
1
0
Fork 0
mirror of https://github.com/notwa/rc synced 2024-09-19 14:24:07 -07:00
Code Issues Releases Wiki Activity

make curl better match wget behavior in obtain

Browse source
This commit is contained in:
Connor Olding 2024-07-04 19:56:09 -07:00
parent 9a59e7561e
commit 44065e8571
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
sh/obtain
View file

@ -40,7 +40,7 @@ __obtain_signed() {
__obtain_prep() { # can be run many times in case curl/wget becomes available.
gzip -V >/dev/null 2>&1 && __obtain_x=.gz || __obtain_x=
if curl; [ $? = 2 ]; then __obtain_url() { curl -fsS -m45 -o- "$*" ;}
if curl; [ $? = 2 ]; then __obtain_url() { curl -sfL -m45 -o- "$*" ;}
elif wget; [ $? = 1 ]; then __obtain_url() { wget -qt1 -T45 -O- "$*" ;}
elif __obtain_burl microsoft.com >/dev/null
then __obtain_url() { __obtain_burl "$*" ;}
@ -98,8 +98,8 @@ __obtain() {
__obtain_die "failed to determine paths to bootstrap files"
# TODO: escape paths in case they contain spaces or special characters.
eval "__obtain_url() { $curl --cacert $cert -qfsS -m45 -o- \"\$*\" ;}"
__obtain_url https://ipinfo.io
eval "__obtain_url() { $curl --cacert $cert -qsfL -m45 -o- \"\$*\" ;}"
#__obtain_url https://ipinfo.io
# FIXME? curl is still accessing these files:
# $ strace -fe trace=file ~/play/bootstrap/curl -q --cacert ~/play/bootstrap/cacert.pem https://example.com