summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEthan Sommer <e5ten.arch@gmail.com>2019-12-30 11:41:46 -0500
committerEthan Sommer <e5ten.arch@gmail.com>2019-12-30 11:45:14 -0500
commit38d32fd117f0dd4cd3ab45eee7d0d67c74af3b12 (patch)
tree701768bb5ef034832b5f3c3b73bc292328eea643
parent0ef1c97f89fa6ecb9bf4348c48d0e5cb27c6613a (diff)
remove early NothingToDo
was preventing checking for packages missing from repos and AUR
-rw-r--r--Makefile3
-rwxr-xr-xpacaur13
2 files changed, 9 insertions, 7 deletions
diff --git a/Makefile b/Makefile
index 92efc45..f60d8c8 100644
--- a/Makefile
+++ b/Makefile
@@ -47,8 +47,7 @@ all: doc
doc:
ifneq ($(POD2MAN),)
@echo "Generating documentation..."
- @pod2man --utf8 --section=8 --center="Pacaur Manual" --name="PACAUR" \
- --release="pacaur $(VERSION)" ./README.pod ./pacaur.8
+ @pod2man -u -s 8 -c "Pacaur Manual" -n "PACAUR" -r "pacaur $(VERSION)" < ./README.pod > ./pacaur.8
endif
# aux
diff --git a/pacaur b/pacaur
index d055d79..413143f 100755
--- a/pacaur
+++ b/pacaur
@@ -29,7 +29,12 @@ export QUIET="${QUIET:-0}"
command -v gettext >/dev/null || gettext() { printf '%s\n' "$@";}
# check if we have sudo, if not use su instead, but this isn't a good time
-command -v sudo >/dev/null || sudo() { su root -c "$(printf '%q ' "$@")";}
+command -v sudo >/dev/null ||
+ sudo() {
+ local params
+ printf -v params '%q ' "$@"
+ su root -c "${params}"
+ }
# import libmakepkg
for lib in config option parseopts; do
@@ -85,7 +90,7 @@ ClassifyPkgs() {
done
if [[ "${noaurpkgs[*]}" ]]; then
while read -r i; do
- #[[ "${i}" != 'error: database not found: '* ]] || continue
+ [[ "${i}" != 'error: database not found: '* ]] || continue
i="${i#error: target not found: }"
[[ "${i}" != 'error: '* ]] || continue
[[ " ${noaurpkgs[*]} " = *' '+([a-zA-Z0-9.+-])"/${i} "* ]] || aurpkgs+=("${i}")
@@ -116,8 +121,6 @@ UpgradeAur() {
# global aurpkgs
info $"%sStarting AUR upgrade...%s" "${colorW}" "${reset}"
mapfile -t aurpkgs < <(auracle sync -q) # use auracle to find out of date AUR packages
- # quit if there are no possibilities for packages ending up in aurpkgs
- ((devel)) || NothingToDo "${aurpkgs[@]}" "${pkgs[@]}"
mapfile -t foreignpkgs < <("${pacman}" -Qmq)
SetInfo "${foreignpkgs[@]}"
@@ -146,7 +149,7 @@ UpgradeAur() {
IgnoreChecks() {
local checkaurpkgs checkaurpkgsver checkaurgrps i j
# global aurpkgs rmaurpkgs
- [[ "${ignoredpkgs[*]:-}" || "${ignoredgrps[*]:-}" ]] || return
+ [[ "${ignoredpkgs[*]:-}${ignoredgrps[*]:-}" ]] || return
# remove AUR pkgs versioning
aurpkgsnover=("${aurpkgs[@]%%[><=]*}")