diff --git a/docs/compile/builder-linux/build_deps.sh b/docs/compile/builder-linux/build_deps.sh index 466f3db..ee83e49 100755 --- a/docs/compile/builder-linux/build_deps.sh +++ b/docs/compile/builder-linux/build_deps.sh @@ -11,17 +11,17 @@ dl_deps() ( cd "$DEPS" exists_dir libnfnetlink-* || - curl -Lo - https://www.netfilter.org/pub/libnfnetlink/libnfnetlink-1.0.2.tar.bz2 | tar -xj || exit 5 + curl $CURL_OPT -Lo - https://www.netfilter.org/pub/libnfnetlink/libnfnetlink-1.0.2.tar.bz2 | tar -xj || exit 5 exists_dir libmnl-* || - curl -Lo - https://www.netfilter.org/pub/libmnl/libmnl-1.0.5.tar.bz2 | tar -xj || exit 5 + curl $CURL_OPT -Lo - https://www.netfilter.org/pub/libmnl/libmnl-1.0.5.tar.bz2 | tar -xj || exit 5 exists_dir libnetfilter_queue-* || - curl -Lo - https://www.netfilter.org/pub/libnetfilter_queue/libnetfilter_queue-1.0.5.tar.bz2 | tar -xj || exit 5 + curl $CURL_OPT -Lo - https://www.netfilter.org/pub/libnetfilter_queue/libnetfilter_queue-1.0.5.tar.bz2 | tar -xj || exit 5 exists_dir zlib-* || - curl -Lo - https://zlib.net/fossils/zlib-1.3.2.tar.gz | tar -xz || exit 5 + curl $CURL_OPT -Lo - https://zlib.net/fossils/zlib-1.3.2.tar.gz | tar -xz || exit 5 exists_dir luajit2-* || - curl -Lo - https://github.com/openresty/luajit2/archive/refs/tags/v${LUAJIT_RELEASE}.tar.gz | tar -xz || exit 5 + curl $CURL_OPT -Lo - https://github.com/openresty/luajit2/archive/refs/tags/v${LUAJIT_RELEASE}.tar.gz | tar -xz || exit 5 exists_dir lua-* || - curl -Lo - https://www.lua.org/ftp/lua-${LUA_RELEASE}.tar.gz | tar -xz || exit 5 + curl $CURL_OPT -Lo - https://www.lua.org/ftp/lua-${LUA_RELEASE}.tar.gz | tar -xz || exit 5 ) } diff --git a/docs/compile/builder-linux/build_zapret1.sh b/docs/compile/builder-linux/build_zapret1.sh index 85efcfd..9121fbc 100755 --- a/docs/compile/builder-linux/build_zapret1.sh +++ b/docs/compile/builder-linux/build_zapret1.sh @@ -22,7 +22,7 @@ dl_zapret1() fi ( cd "$ZBASE" - curl -Lo /tmp/zapret.zip "$ZURL" + curl $CURL_OPT -Lo /tmp/zapret.zip "$ZURL" unzip /tmp/zapret.zip rm /tmp/zapret.zip mv zapret-${BRANCH} $ZDIR diff --git a/docs/compile/builder-linux/build_zapret2.sh b/docs/compile/builder-linux/build_zapret2.sh index 25d3ac6..f5f033f 100755 --- a/docs/compile/builder-linux/build_zapret2.sh +++ b/docs/compile/builder-linux/build_zapret2.sh @@ -22,7 +22,7 @@ dl_zapret2() fi ( cd "$ZBASE" - curl -Lo /tmp/zapret2.zip "$ZURL" + curl $CURL_OPT -Lo /tmp/zapret2.zip "$ZURL" unzip /tmp/zapret2.zip rm /tmp/zapret2.zip mv zapret2-${BRANCH} $ZDIR diff --git a/docs/compile/builder-linux/common.inc b/docs/compile/builder-linux/common.inc index e67ab07..9277b50 100644 --- a/docs/compile/builder-linux/common.inc +++ b/docs/compile/builder-linux/common.inc @@ -1,6 +1,8 @@ EXEDIR="$(dirname "$0")" EXEDIR="$(cd "$EXEDIR"; pwd)" +CURL_OPT="--connect-timeout 5 --max-time 120 --retry 5 --retry-delay 30" + TOOLCHAINS="$EXEDIR/toolchain" DEPS="$EXEDIR/deps" STAGE="$EXEDIR/staging" diff --git a/docs/compile/builder-linux/get_toolchains.sh b/docs/compile/builder-linux/get_toolchains.sh index d47c0f9..1044739 100755 --- a/docs/compile/builder-linux/get_toolchains.sh +++ b/docs/compile/builder-linux/get_toolchains.sh @@ -17,6 +17,6 @@ ask_target 1 cd "$TOOLCHAINS" for t in $TGT; do [ -d "$t" ] && rm -r "$t" - curl -Lo - "${BASEURL}/${t}.tar.xz" | tar -Jx + curl $CURL_OPT -Lo - "${BASEURL}/${t}.tar.xz" | tar -Jx done )