summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorEli Schwartz <eschwartz@archlinux.org>2021-04-05 23:26:07 +0200
committerAllan McRae <allan@archlinux.org>2021-04-07 14:41:54 +0200
commit2535611d6c3cbf951408c50ab35953efaf32f686 (patch)
treeced97b08051b9d646f10105c81fa58933ec82eb6 /scripts
parentd6f86594434729b77e9131880738290140086d40 (diff)
downloadpacman-2535611d6c3cbf951408c50ab35953efaf32f686.tar.gz
pacman-2535611d6c3cbf951408c50ab35953efaf32f686.tar.xz
makepkg: add PACMAN_AUTH configurable setting for sudo elevation
If specified, this will be used no matter what. If not, then we check if sudo exists and use that, or else fall back on su. Implements FS#32621 Signed-off-by: Eli Schwartz <eschwartz@archlinux.org> Signed-off-by: Allan McRae <allan@archlinux.org>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/libmakepkg/executable/sudo.sh.in2
-rw-r--r--scripts/makepkg.sh.in13
2 files changed, 11 insertions, 4 deletions
diff --git a/scripts/libmakepkg/executable/sudo.sh.in b/scripts/libmakepkg/executable/sudo.sh.in
index ea494beb..1e139238 100644
--- a/scripts/libmakepkg/executable/sudo.sh.in
+++ b/scripts/libmakepkg/executable/sudo.sh.in
@@ -29,7 +29,7 @@ executable_functions+=('executable_sudo')
executable_sudo() {
if (( DEP_BIN || RMDEPS || INSTALL )); then
- if ! type -p sudo >/dev/null; then
+ if (( ${#PACMAN_AUTH[@]} == 0 )) && ! type -p sudo >/dev/null; then
warning "$(gettext "Cannot find the %s binary. Will use %s to acquire root privileges.")" "sudo" "su"
fi
fi
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index f4a2de7d..92cb6398 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -225,15 +225,22 @@ missing_source_file() {
}
run_pacman() {
- local cmd
+ local cmd cmdescape
if [[ $1 = -@(T|Q)*([[:alpha:]]) ]]; then
cmd=("$PACMAN_PATH" "$@")
else
cmd=("$PACMAN_PATH" "${PACMAN_OPTS[@]}" "$@")
- if type -p sudo >/dev/null; then
+ cmdescape="$(printf '%q ' "${cmd[@]}")"
+ if (( ${#PACMAN_AUTH[@]} )); then
+ if in_array '%c' "${PACMAN_AUTH[@]}"; then
+ cmd=("${PACMAN_AUTH[@]/\%c/$cmdescape}")
+ else
+ cmd=("${PACMAN_AUTH[@]}" "${cmd[@]}")
+ fi
+ elif type -p sudo >/dev/null; then
cmd=(sudo "${cmd[@]}")
else
- cmd=(su root -c "$(printf '%q ' "${cmd[@]}")")
+ cmd=(su root -c "$cmdescape")
fi
local lockfile="$(pacman-conf DBPath)/db.lck"
while [[ -f $lockfile ]]; do