nocci/gnutaler-docker
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Relax GNUnet tarball check to meson.build only

Browse source
This commit is contained in:
nocci 2025-12-12 11:06:21 +00:00
parent a0e717c913
commit a69937735f
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Dockerfile
View file

@ -32,7 +32,7 @@ RUN set -e; \
cp "${LOCAL_TARBALL}" gnunet.tar.gz; \ cp "${LOCAL_TARBALL}" gnunet.tar.gz; \
tar xzf gnunet.tar.gz; \ tar xzf gnunet.tar.gz; \
GNUNET_DIR="$(ls -d gnunet-* | head -1)"; \ GNUNET_DIR="$(ls -d gnunet-* | head -1)"; \
if [ ! -f "${GNUNET_DIR}/doc/handbook/meson.build" ]; then \ if [ ! -f "${GNUNET_DIR}/meson.build" ]; then \
echo "Local tarball seems incomplete; falling back to git clone ${GNUNET_REF}"; \ echo "Local tarball seems incomplete; falling back to git clone ${GNUNET_REF}"; \
rm -rf "${GNUNET_DIR}"; \ rm -rf "${GNUNET_DIR}"; \
git clone --depth 1 --branch "${GNUNET_REF}" https://git.taler.net/gnunet.git gnunet; \ git clone --depth 1 --branch "${GNUNET_REF}" https://git.taler.net/gnunet.git gnunet; \
@ -43,8 +43,8 @@ RUN set -e; \
curl -L "${GNUNET_TARBALL_URL}" -o gnunet.tar.gz; \ curl -L "${GNUNET_TARBALL_URL}" -o gnunet.tar.gz; \
tar xzf gnunet.tar.gz; \ tar xzf gnunet.tar.gz; \
GNUNET_DIR="$(ls -d gnunet-* | head -1)"; \ GNUNET_DIR="$(ls -d gnunet-* | head -1)"; \
if [ ! -f "${GNUNET_DIR}/doc/handbook/meson.build" ]; then \ if [ ! -f "${GNUNET_DIR}/meson.build" ]; then \
echo "Tarball seems incomplete (doc/handbook/meson.build missing); falling back to git clone ${GNUNET_REF}"; \ echo "Tarball seems incomplete; falling back to git clone ${GNUNET_REF}"; \
rm -rf "${GNUNET_DIR}"; \ rm -rf "${GNUNET_DIR}"; \
git clone --depth 1 --branch "${GNUNET_REF}" https://git.taler.net/gnunet.git gnunet; \ git clone --depth 1 --branch "${GNUNET_REF}" https://git.taler.net/gnunet.git gnunet; \
GNUNET_DIR="gnunet"; \ GNUNET_DIR="gnunet"; \