Skip to content

Minor issues fixes #63

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 22, 2025
Merged

Minor issues fixes #63

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5660088
contrib: fixed fetch detection
thresheek Oct 13, 2025
0aabca9
contrib: nginx-acme: don't error out if .cargo already exists
thresheek Oct 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion alpine/Makefile.module-acme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ define MODULE_PREBUILD_acme
export NGX_ACME_STATE_PREFIX=/var/cache/nginx \&\& \
export RUSTFLAGS='-Ctarget-feature=-crt-static' \&\& \
cd $$builddir \&\& \
mkdir .cargo \&\& \
mkdir -p .cargo \&\& \
echo '[source.crates-io]' > .cargo/config.toml \&\& \
echo 'replace-with = "vendored-sources"' >> .cargo/config.toml \&\& \
echo '[source.vendored-sources]' >> .cargo/config.toml \&\& \
Expand Down
4 changes: 2 additions & 2 deletions contrib/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,13 @@ download = (rm -f [email protected] && \
wget --passive -c -p -O [email protected] "$(1)" && \
touch [email protected] && \
mv [email protected] $@ )
else ifeq ($(which fetch >/dev/null 2>&1 || echo FAIL),)
else ifeq ($(shell which fetch >/dev/null 2>&1 || echo FAIL),)
download = (rm -f [email protected] && \
fetch -p -o [email protected] "$(1)" && \
touch [email protected] && \
mv [email protected] $@)
else
download = $(error Neither curl nor wget found)
download = $(error Neither curl nor wget nor fetch found)
endif

ifdef CONTRIB_FAIL_EARLY
Expand Down
2 changes: 1 addition & 1 deletion debian/Makefile.module-acme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ export MODULE_DEFINITIONS_acme
define MODULE_PREBUILD_acme
set -ex \&\& \
cd $$(CURDIR)/debian/ \&\& \
mkdir .cargo \&\& \
mkdir -p .cargo \&\& \
echo '[source.crates-io]' > .cargo/config.toml \&\& \
echo 'replace-with = "vendored-sources"' >> .cargo/config.toml \&\& \
echo '[source.vendored-sources]' >> .cargo/config.toml \&\& \
Expand Down
2 changes: 1 addition & 1 deletion rpm/SPECS/Makefile.module-acme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ export MODULE_ENV_acme

define MODULE_PREBUILD_acme
cd %{bdir} \&\& \
mkdir .cargo \&\& \
mkdir -p .cargo \&\& \
echo '[source.crates-io]' > .cargo/config.toml \&\& \
echo 'replace-with = "vendored-sources"' >> .cargo/config.toml \&\& \
echo '[source.vendored-sources]' >> .cargo/config.toml \&\& \
Expand Down