mirror of
https://github.com/moparisthebest/pacman
synced 2024-08-13 17:03:46 -04:00
asdeps flag passed from makepkg to pacman
add the asdeps flag for makepkg so that it does pacman -U --asdeps [Allan: clean-up whitespace] Signed-off-by: Daniel Wallace <daniel.wallace12@gmail.com> Signed-off-by: Dan McGee <dan@archlinux.org>
This commit is contained in:
parent
d2669b4781
commit
52550a2a0a
@ -74,9 +74,9 @@ _makepkg() {
|
|||||||
COMPREPLY=()
|
COMPREPLY=()
|
||||||
_get_comp_words_by_ref cur prev
|
_get_comp_words_by_ref cur prev
|
||||||
if [[ $cur = -* && ! $prev =~ ^-(-(config|help)$|\w*[Chp]) ]]; then
|
if [[ $cur = -* && ! $prev =~ ^-(-(config|help)$|\w*[Chp]) ]]; then
|
||||||
opts=('allsource asroot check clean config force geninteg help holdver ignorearch
|
opts=('allsource asdeps asroot check clean config force geninteg help holdver ignorearch
|
||||||
install log nobuild nocheck nocolor noconfirm nodeps noextract noprogressbar
|
install log nobuild nocheck nocolor noconfirm nodeps noextract
|
||||||
nosign pkg repackage rmdeps sign skipinteg source syncdeps'
|
noprogressbar nosign pkg repackage rmdeps sign skipinteg source syncdeps'
|
||||||
'A L R S c d e f g h i m o p r s')
|
'A L R S c d e f g h i m o p r s')
|
||||||
_arch_ptr2comp opts
|
_arch_ptr2comp opts
|
||||||
fi
|
fi
|
||||||
|
@ -483,6 +483,7 @@ _makepkg_longopts=(
|
|||||||
'--skipinteg[do not perform any verification checks on source files]'
|
'--skipinteg[do not perform any verification checks on source files]'
|
||||||
'--skippgpcheck[Do not verify source files with PGP signatures]'
|
'--skippgpcheck[Do not verify source files with PGP signatures]'
|
||||||
'--noconfirm[do not ask for confirmation when resolving dependencies]'
|
'--noconfirm[do not ask for confirmation when resolving dependencies]'
|
||||||
|
'--asdeps[Install packages as non-explicitly installed]'
|
||||||
'--noprogressbar[Do not show a progress bar when downloading files]'
|
'--noprogressbar[Do not show a progress bar when downloading files]'
|
||||||
)
|
)
|
||||||
_makepkg(){
|
_makepkg(){
|
||||||
|
@ -179,6 +179,10 @@ Options
|
|||||||
(Passed to pacman) Prevent pacman from waiting for user input before
|
(Passed to pacman) Prevent pacman from waiting for user input before
|
||||||
proceeding with operations.
|
proceeding with operations.
|
||||||
|
|
||||||
|
*\--asdeps*::
|
||||||
|
(Passed to pacman) Install packages as non-explicitly installed (used
|
||||||
|
with -i / --install).
|
||||||
|
|
||||||
*\--noprogressbar*::
|
*\--noprogressbar*::
|
||||||
(Passed to pacman) Prevent pacman from displaying a progress bar;
|
(Passed to pacman) Prevent pacman from displaying a progress bar;
|
||||||
useful if you are redirecting makepkg output to file.
|
useful if you are redirecting makepkg output to file.
|
||||||
|
@ -52,6 +52,7 @@ splitpkg_overrides=('pkgver' 'pkgrel' 'epoch' 'pkgdesc' 'arch' 'url' 'license' \
|
|||||||
readonly -a packaging_options other_options splitpkg_overrides
|
readonly -a packaging_options other_options splitpkg_overrides
|
||||||
|
|
||||||
# Options
|
# Options
|
||||||
|
ASDEPS=0
|
||||||
ASROOT=0
|
ASROOT=0
|
||||||
CLEANUP=0
|
CLEANUP=0
|
||||||
DEP_BIN=0
|
DEP_BIN=0
|
||||||
@ -1524,6 +1525,8 @@ install_package() {
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
local fullver pkgarch pkg pkglist
|
local fullver pkgarch pkg pkglist
|
||||||
|
(( ASDEPS )) && pkglist+=('--asdeps')
|
||||||
|
|
||||||
for pkg in ${pkgname[@]}; do
|
for pkg in ${pkgname[@]}; do
|
||||||
fullver=$(get_full_version $pkg)
|
fullver=$(get_full_version $pkg)
|
||||||
pkgarch=$(get_pkg_arch $pkg)
|
pkgarch=$(get_pkg_arch $pkg)
|
||||||
@ -1986,6 +1989,7 @@ usage() {
|
|||||||
printf -- "$(gettext "These options can be passed to %s:")\n" "pacman"
|
printf -- "$(gettext "These options can be passed to %s:")\n" "pacman"
|
||||||
echo
|
echo
|
||||||
printf -- "$(gettext " --noconfirm Do not ask for confirmation when resolving dependencies")\n"
|
printf -- "$(gettext " --noconfirm Do not ask for confirmation when resolving dependencies")\n"
|
||||||
|
printf -- "$(gettext " --asdeps Install packages as non-explicitly installed")\n"
|
||||||
printf -- "$(gettext " --noprogressbar Do not show a progress bar when downloading files")\n"
|
printf -- "$(gettext " --noprogressbar Do not show a progress bar when downloading files")\n"
|
||||||
echo
|
echo
|
||||||
printf -- "$(gettext "If %s is not specified, %s will look for '%s'")\n" "-p" "makepkg" "$BUILDSCRIPT"
|
printf -- "$(gettext "If %s is not specified, %s will look for '%s'")\n" "-p" "makepkg" "$BUILDSCRIPT"
|
||||||
@ -2021,7 +2025,7 @@ OPT_LONG=('allsource' 'asroot' 'ignorearch' 'check' 'clean' 'nodeps'
|
|||||||
'version' 'config:')
|
'version' 'config:')
|
||||||
|
|
||||||
# Pacman Options
|
# Pacman Options
|
||||||
OPT_LONG+=('noconfirm' 'noprogressbar')
|
OPT_LONG+=('asdeps' 'noconfirm' 'noprogressbar')
|
||||||
|
|
||||||
if ! parseopts "$OPT_SHORT" "${OPT_LONG[@]}" -- "$@"; then
|
if ! parseopts "$OPT_SHORT" "${OPT_LONG[@]}" -- "$@"; then
|
||||||
exit 1 # E_INVALID_OPTION;
|
exit 1 # E_INVALID_OPTION;
|
||||||
@ -2032,6 +2036,7 @@ unset OPT_SHORT OPT_LONG OPTRET
|
|||||||
while true; do
|
while true; do
|
||||||
case "$1" in
|
case "$1" in
|
||||||
# Pacman Options
|
# Pacman Options
|
||||||
|
--asdeps) ASDEPS=1;;
|
||||||
--noconfirm) PACMAN_OPTS+=" --noconfirm" ;;
|
--noconfirm) PACMAN_OPTS+=" --noconfirm" ;;
|
||||||
--noprogressbar) PACMAN_OPTS+=" --noprogressbar" ;;
|
--noprogressbar) PACMAN_OPTS+=" --noprogressbar" ;;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user