diff --git a/.github/aur/flux-bin/PKGBUILD.template b/.github/aur/flux-bin/PKGBUILD.template index 6bb09e17..aa4b33db 100644 --- a/.github/aur/flux-bin/PKGBUILD.template +++ b/.github/aur/flux-bin/PKGBUILD.template @@ -8,18 +8,20 @@ pkgdesc="Open and extensible continuous delivery solution for Kubernetes" url="https://fluxcd.io/" arch=("x86_64" "armv6h" "armv7h" "aarch64") license=("APACHE") -optdepends=("kubectl") +optdepends=('kubectl: for apply actions on the Kubernetes cluster', +'bash-completion: auto-completion for flux in Bash', +'zsh-completions: auto-completion for flux in ZSH') source_x86_64=( - "$pkgname-$pkgver.tar.gz::https://github.com/fluxcd/flux2/releases/download/v${pkgver}/flux_${pkgver}_linux_amd64.tar.gz" + "${pkgname}-${pkgver}.tar.gz::https://github.com/fluxcd/flux2/releases/download/v${pkgver}/flux_${pkgver}_linux_amd64.tar.gz" ) source_armv6h=( - "$pkgname-$pkgver.tar.gz::https://github.com/fluxcd/flux2/releases/download/v${pkgver}/flux_${pkgver}_linux_arm.tar.gz" + "${pkgname}-${pkgver}.tar.gz::https://github.com/fluxcd/flux2/releases/download/v${pkgver}/flux_${pkgver}_linux_arm.tar.gz" ) source_armv7h=( - "$pkgname-$pkgver.tar.gz::https://github.com/fluxcd/flux2/releases/download/v${pkgver}/flux_${pkgver}_linux_arm.tar.gz" + "${pkgname}-${pkgver}.tar.gz::https://github.com/fluxcd/flux2/releases/download/v${pkgver}/flux_${pkgver}_linux_arm.tar.gz" ) source_aarch64=( - "$pkgname-$pkgver.tar.gz::https://github.com/fluxcd/flux2/releases/download/v${pkgver}/flux_${pkgver}_linux_arm64.tar.gz" + "${pkgname}-${pkgver}.tar.gz::https://github.com/fluxcd/flux2/releases/download/v${pkgver}/flux_${pkgver}_linux_arm64.tar.gz" ) sha256sums_x86_64=( ${SHA256SUM_AMD64} @@ -33,7 +35,12 @@ sha256sums_armv7h=( sha256sums_aarch64=( ${SHA256SUM_ARM64} ) +_srcname=flux package() { - install -Dm755 flux "$pkgdir/usr/bin/flux" + install -Dm755 ${_srcname} "${pkgdir}/usr/bin/${_srcname}" + + "${pkgdir}/usr/bin/${_srcname}" completion bash | install -Dm644 /dev/stdin "${pkgdir}/usr/share/bash-completion/completions/${_srcname}" + "${pkgdir}/usr/bin/${_srcname}" completion fish | install -Dm644 /dev/stdin "${pkgdir}/usr/share/fish/vendor_completions.d/${_srcname}.fish" + "${pkgdir}/usr/bin/${_srcname}" completion zsh | install -Dm644 /dev/stdin "${pkgdir}/usr/share/zsh/site-functions/_${_srcname}" } diff --git a/.github/aur/flux-go/PKGBUILD.template b/.github/aur/flux-go/PKGBUILD.template index c5747339..551bea9b 100644 --- a/.github/aur/flux-go/PKGBUILD.template +++ b/.github/aur/flux-go/PKGBUILD.template @@ -13,31 +13,38 @@ conflicts=("flux-bin") replaces=("flux-cli") depends=("glibc") makedepends=("go") -optdepends=("kubectl") +optdepends=('kubectl: for apply actions on the Kubernetes cluster', +'bash-completion: auto-completion for flux in Bash', +'zsh-completions: auto-completion for flux in ZSH') source=( - "$pkgname-$pkgver.tar.gz::https://github.com/fluxcd/flux2/archive/v$pkgver.tar.gz" + "${pkgname}-${pkgver}.tar.gz::https://github.com/fluxcd/flux2/archive/v${pkgver}.tar.gz" ) sha256sums=( ${SHA256SUM} ) +_srcname=flux build() { - cd "flux2-$pkgver" + cd "flux2-${pkgver}" export CGO_LDFLAGS="$LDFLAGS" export CGO_CFLAGS="$CFLAGS" export CGO_CXXFLAGS="$CXXFLAGS" export CGO_CPPFLAGS="$CPPFLAGS" export GOFLAGS="-buildmode=pie -trimpath -ldflags=-linkmode=external -mod=readonly -modcacherw" - go build -ldflags "-X main.VERSION=$pkgver" -o flux-bin ./cmd/flux + go build -ldflags "-X main.VERSION=${pkgver}" -o ${_srcname} ./cmd/flux } check() { - cd "flux2-$pkgver" + cd "flux2-${pkgver}" make test } package() { - cd "flux2-$pkgver" - install -Dm755 flux-bin "$pkgdir/usr/bin/flux" - install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + cd "flux2-${pkgver}" + install -Dm755 ${_srcname} "${pkgdir}/usr/bin/${_srcname}" + install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + + "${pkgdir}/usr/bin/${_srcname}" completion bash | install -Dm644 /dev/stdin "${pkgdir}/usr/share/bash-completion/completions/${_srcname}" + "${pkgdir}/usr/bin/${_srcname}" completion fish | install -Dm644 /dev/stdin "${pkgdir}/usr/share/fish/vendor_completions.d/${_srcname}.fish" + "${pkgdir}/usr/bin/${_srcname}" completion zsh | install -Dm644 /dev/stdin "${pkgdir}/usr/share/zsh/site-functions/_${_srcname}" } diff --git a/.github/aur/flux-scm/PKGBUILD.template b/.github/aur/flux-scm/PKGBUILD.template index 09c0537b..08aee439 100644 --- a/.github/aur/flux-scm/PKGBUILD.template +++ b/.github/aur/flux-scm/PKGBUILD.template @@ -12,11 +12,14 @@ provides=("flux-bin") conflicts=("flux-bin") depends=("glibc") makedepends=("go") -optdepends=("kubectl") +optdepends=('kubectl: for apply actions on the Kubernetes cluster', +'bash-completion: auto-completion for flux in Bash', +'zsh-completions: auto-completion for flux in ZSH') source=( "git+https://github.com/fluxcd/flux2.git" ) md5sums=('SKIP') +_srcname=flux pkgver() { cd "flux2" @@ -30,7 +33,7 @@ build() { export CGO_CXXFLAGS="$CXXFLAGS" export CGO_CPPFLAGS="$CPPFLAGS" export GOFLAGS="-buildmode=pie -trimpath -ldflags=-linkmode=external -mod=readonly -modcacherw" - go build -ldflags "-X main.VERSION=$pkgver" -o flux-bin ./cmd/flux + go build -ldflags "-X main.VERSION=${pkgver}" -o ${_srcname} ./cmd/flux } check() { @@ -40,6 +43,10 @@ check() { package() { cd "flux2" - install -Dm755 flux-bin "$pkgdir/usr/bin/flux" - install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + install -Dm755 ${_srcname} "${pkgdir}/usr/bin/${_srcname}" + install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + + "${pkgdir}/usr/bin/${_srcname}" completion bash | install -Dm644 /dev/stdin "${pkgdir}/usr/share/bash-completion/completions/${_srcname}" + "${pkgdir}/usr/bin/${_srcname}" completion fish | install -Dm644 /dev/stdin "${pkgdir}/usr/share/fish/vendor_completions.d/${_srcname}.fish" + "${pkgdir}/usr/bin/${_srcname}" completion zsh | install -Dm644 /dev/stdin "${pkgdir}/usr/share/zsh/site-functions/_${_srcname}" }