diff --git a/Makefile b/Makefile index 617c7d1..a1f4bb6 100644 --- a/Makefile +++ b/Makefile @@ -1,26 +1,29 @@ -NFPM= docker run --rm -v $(PWD)/$(PORTNAME):/work -w /work -e VERSION=$(VERSION) goreleaser/nfpm -DISTDIR= $(PORTNAME)/dist +NFPM= docker run --rm -v $(CURDIR):/work -w /work -e VERSION=$(VERSION) goreleaser/nfpm +DISTDIR= dist FETCH= wget -q -all: fetch build package +GITEA_USER?= andrew +GITEA_URL?= https://git.nakolenke.org +GITEA_ORG?= nakolenke-pub +SUITE?= trixie + +all: fetch build fetch: @echo ">>> Fetching $(DISTFILE)" @$(FETCH) "$(MASTER_SITE)/$(DISTFILE)" -O /tmp/$(DISTFILE) @mkdir -p $(DISTDIR) @unzip -q /tmp/$(DISTFILE) -d $(DISTDIR)/ - @chmod +x $(DISTDIR)/v2ray + @chmod +x $(DISTDIR)/$(PORTNAME) @rm /tmp/$(DISTFILE) build: @echo ">>> Building $(PORTNAME)-$(VERSION).deb" @$(NFPM) package --config nfpm.yaml --target /work --packager deb -package: fetch build - publish: - @echo ">>> Publishing $(PORTNAME)-$(VERSION)_amd64.deb" - @DEB=$$(ls $(PORTNAME)/*.deb | head -1) && \ + @echo ">>> Publishing $(PORTNAME)-$(VERSION)" + @DEB=$$(ls *.deb | head -1) && \ HTTP_CODE=$$(curl -s -o /tmp/resp.txt -w "%{http_code}" \ --user "$(GITEA_USER):$(GITEA_TOKEN)" \ --upload-file "$$DEB" \ @@ -29,6 +32,6 @@ publish: [ "$$HTTP_CODE" = "201" ] || exit 1 clean: - @rm -rf $(PORTNAME)/dist $(PORTNAME)/*.deb + @rm -rf $(DISTDIR) *.deb -.PHONY: all fetch build package publish clean +.PHONY: all fetch build publish clean diff --git a/v2ray/Makefile b/v2ray/Makefile index f50028f..d113b05 100644 --- a/v2ray/Makefile +++ b/v2ray/Makefile @@ -1,7 +1,6 @@ PORTNAME= v2ray VERSION!= cat VERSION -DISTNAME= v2ray-linux-64 -DISTFILE= $(DISTNAME).zip +DISTFILE= v2ray-linux-64.zip MASTER_SITE= https://github.com/v2fly/v2ray-core/releases/download/v$(VERSION) .include "../Makefile"