bryson/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

makepkg: fall back to su if sudo is not available

Browse source 
Signed-off-by: Ray Kohler <ataraxia937@gmail.com>
Signed-off-by: Allan McRae <allan@archlinux.org>
Signed-off-by: Dan McGee <dan@archlinux.org>
This commit is contained in:
Ray Kohler 2010-03-04 21:57:46 -05:00 • committed by Dan McGee
parent ccbef232c9
commit 590606a5d7
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
scripts/makepkg.sh.in
View file

@ -344,8 +344,12 @@ download_file() {
run_pacman() { run_pacman() {
local ret=0 local ret=0
if (( ! ASROOT )) && [[ $1 != "-T" && $1 != "-Qq" ]] && sudo -l $PACMAN &>/dev/null; then if (( ! ASROOT )) && [[ $1 != "-T" && $1 != "-Qq" ]]; then
if [ "$(type -p sudo)" ] && sudo -l $PACMAN &>/dev/null; then
sudo $PACMAN $PACMAN_OPTS "$@" || ret=$? sudo $PACMAN $PACMAN_OPTS "$@" || ret=$?
else
su -c "$PACMAN $PACMAN_OPTS $*" || ret=$?
fi
else else
$PACMAN $PACMAN_OPTS "$@" || ret=$? $PACMAN $PACMAN_OPTS "$@" || ret=$?
fi fi
@ -1694,12 +1698,9 @@ else
fi fi
# check for sudo if we will need it during makepkg execution # check for sudo if we will need it during makepkg execution
if (( ! ASROOT && ( DEP_BIN || RMDEPS || INSTALL ) )); then if (( ! ( ASROOT || INFAKEROOT ) && ( DEP_BIN || RMDEPS || INSTALL ) )); then
if [ ! "$(type -p sudo)" ]; then if [ ! "$(type -p sudo)" ]; then
error "$(gettext "Cannot find the sudo binary! Is sudo installed?")" warning "$(gettext "Sudo can not be found. Will use su to acquire root privileges.")"
plain "$(gettext "Missing dependencies cannot be installed or removed as a normal user")"
plain "$(gettext "without sudo; install and configure sudo to auto-resolve dependencies.")"
exit 1
fi fi
fi fi