Fix Arch PKGBUILD generation target

This commit is contained in:
Joe Julian
2026-04-06 21:25:55 -07:00
parent 5bf1bdb5f3
commit 4b7a898a7f
2 changed files with 7 additions and 11 deletions
+6 -4
View File
@@ -15,6 +15,7 @@ ARCH_PKG_DIR ?= packaging/archlinux/keepassgo-git
ARCH_PKG_TMPL ?= $(ARCH_PKG_DIR)/PKGBUILD.tmpl ARCH_PKG_TMPL ?= $(ARCH_PKG_DIR)/PKGBUILD.tmpl
ARCH_PKGBUILD ?= $(ARCH_PKG_DIR)/PKGBUILD ARCH_PKGBUILD ?= $(ARCH_PKG_DIR)/PKGBUILD
ARCH_PKGVER ?= $(shell printf 'r%s.%s' "$$(git rev-list --count HEAD 2>/dev/null || echo 0)" "$$(git rev-parse --short HEAD 2>/dev/null || echo dev)") ARCH_PKGVER ?= $(shell printf 'r%s.%s' "$$(git rev-list --count HEAD 2>/dev/null || echo 0)" "$$(git rev-parse --short HEAD 2>/dev/null || echo dev)")
ARCH_REPO_DIR ?= $(CURDIR)
GOGIO_SIGN_FLAGS := GOGIO_SIGN_FLAGS :=
ifneq ($(strip $(SIGNKEY)),) ifneq ($(strip $(SIGNKEY)),)
@@ -61,8 +62,9 @@ android/keepassgo-android.jar: $(shell find androidsrc -type f | sort)
$$(find androidsrc -name '\''*.java'\'' | sort); \ $$(find androidsrc -name '\''*.java'\'' | sort); \
"$(JAVA_HOME)/bin/jar" --create --file "$$(pwd)/android/keepassgo-android.jar" -C "$$tmpdir" .' "$(JAVA_HOME)/bin/jar" --create --file "$$(pwd)/android/keepassgo-android.jar" -C "$$tmpdir" .'
$(ARCH_PKGBUILD): $(ARCH_PKG_TMPL) Makefile archlinux-pkgbuild: $(ARCH_PKG_TMPL) Makefile
@mkdir -p "$(ARCH_PKG_DIR)" @mkdir -p "$(ARCH_PKG_DIR)"
@sed "s/@PKGVER@/$(ARCH_PKGVER)/g" "$(ARCH_PKG_TMPL)" > "$(ARCH_PKGBUILD)" @sed \
-e 's|@PKGVER@|$(ARCH_PKGVER)|g' \
archlinux-pkgbuild: $(ARCH_PKGBUILD) -e 's|@REPO_DIR@|$(ARCH_REPO_DIR)|g' \
"$(ARCH_PKG_TMPL)" > "$(ARCH_PKGBUILD)"
@@ -27,13 +27,7 @@ source=('git+https://git.julianfamily.org/joejulian/keepassgo.git')
sha256sums=('SKIP') sha256sums=('SKIP')
_repo_dir() { _repo_dir() {
if [[ -d "${srcdir}/keepassgo/.git" ]]; then printf '%s\n' "@REPO_DIR@"
printf '%s\n' "${srcdir}/keepassgo"
return
fi
cd "${startdir}/../../.." || exit 1
pwd
} }
pkgver() { pkgver() {