commit: 763be039e0abf02fc51af23bb36ad8057db1c1ea
parent 5b2748ec7176b5e2e48033d877cad6607ef1c6c4
Author: Haelwenn (lanodan) Monnier <contact@hacktivis.me>
Date: Tue, 4 Feb 2025 18:23:56 +0100
fetch.sh: fetch_forge function
Diffstat:
3 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/distfiles.SHA512SUM b/distfiles.SHA512SUM
@@ -31,7 +31,7 @@ d9bdb935847f4c828c3df484b9070c8604816e820f5b171b893e35ac379e4a7ca2e1f1cba84c6ca0
c806f85682b45ce2fb81f832de364b03c9f36e93e02f9ed0abd492418bd4d4ec8054c6684da1cafec6d8a92a07c26f3f873cb52aa5b1179e9ea9fa25fb21ed34 distfiles/musl-libintl-1.2.5-r9.apk.x86
3b2d0d4b96aa0181cd8552dfdb5d0f24ea26265a2aad463edc7102850aa4a91898bc7adeae15d852129f710eddeb280a0b770cff02c5af5b6c0082b6df250c58 distfiles/musl-libintl-1.2.5-r9.apk.x86_64
3be63637bc1689e56d2eac9fa646e8bd89b8c4ccd4ad028a61c7c5d5e9f3490d3c49657488d39a62451b23f0935b81c5ecd812c92cef9e160f7377f4bd4fc711 distfiles/nawk-20250116.tar.gz
-934099408667070537c7e92eafd3a63956959a987f08f77f33968b6890142aa07381678381a5fc69033e3c279ca2603ad0507a6c34beba85d87ce38904acd090 distfiles/oksh-7.6.tar.gz
+934099408667070537c7e92eafd3a63956959a987f08f77f33968b6890142aa07381678381a5fc69033e3c279ca2603ad0507a6c34beba85d87ce38904acd090 distfiles/oksh-oksh-7.6.tar.gz
58faf7472709f12af203afe926830e3f82e21ee987226f2efa9d3744fd2b6727faa9091d7ded1ffb3f3cdb03e7b7278cc01675d86cf2b3796c49aecd24cf993e distfiles/pdpmake-2.0.3.tgz
ae3d9d593e1645d65f9ab77aa828600c9af4bb30d0a073da7ae3dd805e65b87efaf6a0efb980f2d0168e475ae506eba194547d6479956dabb9d88293a9078a7f distfiles/pigz-2.8.tar.gz
0759e63b9bfdc1e0b2f95e4c5c7be24b4ffa22e06a08cfad7f8e8be9faf99c256b1cbc72159e4ec805791d6b507a80fc344d05d63a1d273c3285dac868bf6ca0 distfiles/pkgconf-pkgconf-2.3.0.tar.gz
diff --git a/fetch.sh b/fetch.sh
@@ -21,6 +21,14 @@ URLS="
"
WORKDIR="$(dirname "$0")"
+fetch_forge() {
+ base=$1
+ name=$2
+ ver=$3
+
+ test -e "${name}-${ver}.tar.gz" || curl ${CURL_OPTS} -o "${name}-${ver}.tar.gz" "${base}/${ver}.tar.gz"
+}
+
. "${WORKDIR}/common.sh"
set -ex
@@ -54,13 +62,11 @@ test -e lanodan-2024.pub || curl ${CURL_OPTS} -o lanodan-2024.pub https://hackti
# Only has ./CVS and .travis-ci.yml removed compared to Github autogenerated tarball
#test -e om4-6.7.tar.gz || curl ${CURL_OPTS} -o om4-6.7.tar.gz https://github.com/ibara/m4/releases/download/om4-6.7/om4-6.7.tar.gz
-test -e nawk-20250116.tar.gz || curl ${CURL_OPTS} -o nawk-20250116.tar.gz https://github.com/onetrueawk/awk/archive/20250116.tar.gz
-
-test -e oksh-7.6.tar.gz || curl ${CURL_OPTS} -o oksh-7.6.tar.gz https://github.com/ibara/oksh/archive/refs/tags/oksh-7.6.tar.gz
-
-test -e yacc-oyacc-6.6.tar.gz || curl ${CURL_OPTS} -o yacc-oyacc-6.6.tar.gz https://github.com/ibara/yacc/archive/refs/tags/oyacc-6.6.tar.gz
+fetch_forge https://github.com/onetrueawk/awk/archive nawk 20250116
+fetch_forge https://github.com/ibara/oksh/archive/refs/tags oksh oksh-7.6
+fetch_forge https://github.com/ibara/yacc/archive/refs/tags yacc oyacc-6.6
+fetch_forge https://github.com/pkgconf/pkgconf/archive/refs/tags pkgconf pkgconf-2.3.0
-test -e pkgconf-pkgconf-2.3.0.tar.gz || curl ${CURL_OPTS} -o pkgconf-pkgconf-2.3.0.tar.gz https://github.com/pkgconf/pkgconf/archive/refs/tags/pkgconf-2.3.0.tar.gz
# suckless.org doesn't provides snapshots of sbase (yet?)
test -e sbase-b30fb568.tar.gz || curl ${CURL_OPTS} -o sbase-b30fb568.tar.gz https://git.sr.ht/~mcf/sbase/archive/b30fb56804bfed69b45ef0e944d2e029e4d26258.tar.gz
diff --git a/make-root.sh b/make-root.sh
@@ -4,7 +4,7 @@
# SPDX-License-Identifier: MPL-2.0
tarballs="
- oksh-7.6.tar.gz
+ oksh-oksh-7.6.tar.gz
yacc-oyacc-6.6.tar.gz
utils-std-0.0.1.tar.gz
pdpmake-2.0.3.tgz
