Browse Source

Merge #531: Use either wget or curl for downloading deps, abort with error if neither present

0f1327626d Use either wget or curl for downloading deps (Kristaps Kaupe)

Pull request description:

  Also changed shebangs to `/usr/bin/env bash`.

  Closes #528

Top commit has no ACKs.

Tree-SHA512: 13b1bde98d8e08e3d3739e3e8713917511e96262b70a106a03316cd0a3f411d9cae919770597448b6b3dd347d8bdaa64f15da0da0ed2793a32cd2613b7bdd472
master
Kristaps Kaupe 6 years ago
parent
commit
a050a893b6
No known key found for this signature in database
GPG Key ID: D47B1B4232B55437
  1. 21
      install.sh
  2. 21
      test/run_tests.sh

21
install.sh

@ -1,4 +1,8 @@
#!/bin/bash
#!/usr/bin/env bash
check_exists() {
command -v "$1" > /dev/null
}
sha256_verify ()
{
@ -11,6 +15,19 @@ sha256_verify ()
fi
}
# http_get url filename
http_get ()
{
if check_exists curl; then
curl --retry 5 -L "$1" -o "$2"
elif check_exists wget; then
wget "$1" -O "$2"
else
echo "Neither curl nor wget present; please install one of them using your OS package manager."
kill $$
fi
}
deps_install ()
{
common_deps=( \
@ -95,7 +112,7 @@ dep_get ()
pushd cache
if ! sha256_verify "${pkg_hash}" "${pkg_name}"; then
curl --retry 5 -L -O "${pkg_url}/${pkg_name}"
http_get "${pkg_url}/${pkg_name}" "${pkg_name}"
fi
if ! sha256_verify "${pkg_hash}" "${pkg_name}"; then
return 1

21
test/run_tests.sh

@ -1,4 +1,8 @@
#!/bin/bash
#!/usr/bin/env bash
check_exists() {
command -v "$1" > /dev/null
}
sha256_verify ()
{
@ -11,6 +15,19 @@ sha256_verify ()
fi
}
# http_get url filename
http_get ()
{
if check_exists curl; then
curl --retry 5 -L "$1" -o "$2"
elif check_exists wget; then
wget "$1" -O "$2"
else
echo "Neither curl nor wget present; please install one of them using your OS package manager."
kill $$
fi
}
run_jm_tests ()
{
if [[ -z "${VIRTUAL_ENV}" ]]; then
@ -27,7 +44,7 @@ run_jm_tests ()
pushd "${jm_source}"
if ! sha256_verify 'ce3a4ddc777343645ccd06ca36233b5777e218ee89d887ef529ece86a917fc33' 'miniircd.tar.gz'; then
curl --retry 5 -L https://github.com/JoinMarket-Org/miniircd/archive/master.tar.gz -o miniircd.tar.gz
http_get "https://github.com/JoinMarket-Org/miniircd/archive/master.tar.gz" "miniircd.tar.gz"
fi
if [[ ! -x ${jm_source}/miniircd/miniircd ]]; then
rm -rf ./miniircd

Loading…
Cancel
Save