makepkg: move pacman calls to a function
Signed-off-by: Cedric Staniewski <cedric@gmx.ca> Signed-off-by: Dan McGee <dan@archlinux.org>
This commit is contained in:
parent
93862bd7cb
commit
82443e0059
|
@ -340,10 +340,21 @@ download_file() {
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
run_pacman() {
|
||||||
|
local ret=0
|
||||||
|
if (( ! ASROOT )) && [[ $1 != "-T" ]]; then
|
||||||
|
sudo pacman $PACMAN_OPTS "$@" || ret=$?
|
||||||
|
else
|
||||||
|
pacman $PACMAN_OPTS "$@" || ret=$?
|
||||||
|
fi
|
||||||
|
return $ret
|
||||||
|
}
|
||||||
|
|
||||||
check_deps() {
|
check_deps() {
|
||||||
(( $# > 0 )) || return
|
(( $# > 0 )) || return
|
||||||
|
|
||||||
pmout=$(pacman $PACMAN_OPTS -T "$@")
|
local ret=0
|
||||||
|
pmout=$(run_pacman -T "$@")
|
||||||
ret=$?
|
ret=$?
|
||||||
if (( ret == 127 )); then #unresolved deps
|
if (( ret == 127 )); then #unresolved deps
|
||||||
echo "$pmout"
|
echo "$pmout"
|
||||||
|
@ -368,15 +379,8 @@ handle_deps() {
|
||||||
if (( DEP_BIN )); then
|
if (( DEP_BIN )); then
|
||||||
# install missing deps from binary packages (using pacman -S)
|
# install missing deps from binary packages (using pacman -S)
|
||||||
msg "$(gettext "Installing missing dependencies...")"
|
msg "$(gettext "Installing missing dependencies...")"
|
||||||
local ret=0
|
|
||||||
|
|
||||||
if (( ! ASROOT )); then
|
if ! run_pacman -S --asdeps $deplist; then
|
||||||
sudo pacman $PACMAN_OPTS -S --asdeps $deplist || ret=$?
|
|
||||||
else
|
|
||||||
pacman $PACMAN_OPTS -S --asdeps $deplist || ret=$?
|
|
||||||
fi
|
|
||||||
|
|
||||||
if (( ret )); then
|
|
||||||
error "$(gettext "Pacman failed to install missing dependencies.")"
|
error "$(gettext "Pacman failed to install missing dependencies.")"
|
||||||
exit 1 # TODO: error code
|
exit 1 # TODO: error code
|
||||||
fi
|
fi
|
||||||
|
@ -434,15 +438,9 @@ remove_deps() {
|
||||||
done
|
done
|
||||||
|
|
||||||
msg "Removing installed dependencies..."
|
msg "Removing installed dependencies..."
|
||||||
local ret=0
|
|
||||||
if (( ! ASROOT )); then
|
|
||||||
sudo pacman $PACMAN_OPTS -Rns $deplist || ret=$?
|
|
||||||
else
|
|
||||||
pacman $PACMAN_OPTS -Rns $deplist || ret=$?
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Fixes FS#10039 - exit cleanly as package has built successfully
|
# exit cleanly on failure to remove deps as package has been built successfully
|
||||||
if (( ret )); then
|
if ! run_pacman -Rns $deplist; then
|
||||||
warning "$(gettext "Failed to remove installed dependencies.")"
|
warning "$(gettext "Failed to remove installed dependencies.")"
|
||||||
return 0
|
return 0
|
||||||
fi
|
fi
|
||||||
|
@ -1134,14 +1132,7 @@ install_package() {
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
|
||||||
local ret=0
|
if ! run_pacman -U $pkglist; then
|
||||||
if (( ! ASROOT )); then
|
|
||||||
sudo pacman $PACMAN_OPTS -U ${pkglist} || ret=$?
|
|
||||||
else
|
|
||||||
pacman $PACMAN_OPTS -U ${pkglist} || ret=$?
|
|
||||||
fi
|
|
||||||
|
|
||||||
if (( ret )); then
|
|
||||||
warning "$(gettext "Failed to install built package(s).")"
|
warning "$(gettext "Failed to install built package(s).")"
|
||||||
return 0
|
return 0
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Reference in New Issue