Skip to content

[pull] master from aurutils:master #19

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
pull merged 3 commits into from
Jun 11, 2025
Merged

[pull] master from aurutils:master #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d2bc778
Fix bash completion
julio-b Jun 3, 2025
f69c0d6
Merge pull request #1201 from julio-b/fixbashcomp
AladW Jun 11, 2025
5605d0a
aurutils: v20.5.2
AladW Jun 11, 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
4 changes: 2 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ ETCDIR ?= /etc
AURUTILS_LIB_DIR ?= $(LIBDIR)/$(PROGNM)
AURUTILS_VERSION ?= $(shell git describe --tags || true)
ifeq ($(AURUTILS_VERSION),)
AURUTILS_VERSION := 20.5.1
AURUTILS_VERSION := 20.5.2
endif
AURUTILS_LIB = $(shell find lib/ -name 'aur-*')
AURUTILS_LIB := $(shell find lib/ -type f -name 'aur-*')

.PHONY: shellcheck install build completion aur

Expand Down
4 changes: 3 additions & 1 deletion completions/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,11 @@ ZSH_SITE_FUNCTIONS = \
zsh/_aur_packages \
zsh/_aur_repositories

AURUTILS_LIB := $(shell find ../lib -type f -name 'aur-*')

bash: bash/aur

bash/aur: bash/aurutils.in ../lib/*
bash/aur: bash/aurutils.in $(AURUTILS_LIB)
bash $< >$@

install-bash: bash/aur
Expand Down
2 changes: 1 addition & 1 deletion completions/command_opts.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ default_opts() {
local cmd corecommands=() opts=()

for cmd in "${have_optdump[@]}"; do
mapfile -t opts < <(bash "../lib/aur-${cmd}" --dump-options | LC_ALL=C sort)
mapfile -t opts < <(find ../lib -type f -name "aur-$cmd" -exec bash -- {} --dump-options ';' | LC_ALL=C sort)
corecommands+=("default_cmds[${cmd}]='${opts[*]}'")
done

Expand Down
4 changes: 1 addition & 3 deletions makepkg/aurutils.changelog
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
## 20.5.1
## 20.5

* `aur-build`
+ do not define `LOGDEST` explicitly

## 20.5

* `aur-chroot`
+ preserve `LOGDEST` and `SRCDEST` by default (#1196)

Expand Down