Skip to content

Commit b51639f

Browse files
committed
Add support for dependencies with architecture-specific names
This will add support for depends, makedepends and optdepends arrays that are accompanied by an architecture name. For example: depends_x86_64, makedepends_i686 and optdepends_x86_64.
1 parent 3378ec5 commit b51639f

File tree

1 file changed

+17
-4
lines changed

1 file changed

+17
-4
lines changed

packer

100644100755
Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -135,8 +135,11 @@ existsinlocal() {
135135
scrapeaurdeps() {
136136
pkginfo "$1" "$preview"
137137
. "$tmpdir/$1.PKGBUILD"
138+
local deps_carch=( $(eval "echo \$$(echo {depends_${CARCH}[@]})") )
139+
local mkdeps_carch=( $(eval "echo \$$(echo {makedepends_${CARCH}[@]})") )
138140
IFS=$'\n'
139-
dependencies=( $(echo -e "${depends[*]}\n${makedepends[*]}" | sed -e 's/=.*//' -e 's/>.*//' -e 's/<.*//'| sort -u) )
141+
dependencies=( $(echo -e "${depends[*]}\n${makedepends[*]}\n${deps_carch[*]}\n${mkdeps_carch[*]}" |
142+
sed -e 's/=.*//' -e 's/>.*//' -e 's/<.*//'| sort -u) )
140143
unset IFS
141144
}
142145

@@ -770,19 +773,22 @@ if [[ $option = info ]]; then
770773

771774
# Echo out the -Si formatted package information
772775
# Retrieve each element in order and echo them immediately
776+
depends_carch=( $(eval "echo \$$(echo {depends_${CARCH}[@]})") )
777+
makedepends_carch=( $(eval "echo \$$(echo {makedepends_${CARCH}[@]})") )
773778
echo -e "${COLOR1}Repository : ${COLOR3}aur"
774779
echo -e "${COLOR1}Name : $pkgname"
775780
echo -e "${COLOR1}Version : ${COLOR2}$pkgver-$pkgrel"
776781
echo -e "${COLOR1}URL : ${COLOR4}$url"
777782
echo -e "${COLOR1}Licenses : ${ENDCOLOR}${license[@]}"
778783
echo -e "${COLOR1}Groups : ${ENDCOLOR}${groups[@]:-None}"
779784
echo -e "${COLOR1}Provides : ${ENDCOLOR}${provides[@]:-None}"
780-
echo -e "${COLOR1}Depends On : ${ENDCOLOR}${depends[@]}"
781-
echo -e "${COLOR1}Make Depends : ${ENDCOLOR}${makedepends[@]}"
785+
echo -e "${COLOR1}Depends On : ${ENDCOLOR}${depends[@]} ${depends_carch[@]}"
786+
echo -e "${COLOR1}Make Depends : ${ENDCOLOR}${makedepends[@]} ${makedepends_carch[@]}"
782787
echo -e -n "${COLOR1}Optional Deps : ${ENDCOLOR}"
783788

784789
len="${#optdepends[@]}"
785-
if [[ $len -eq 0 ]]; then
790+
len_carch="$(eval "echo \$$(echo {#optdepends_${CARCH}[@]})")"
791+
if [[ $len -eq 0 ]] && [[ $len_carch -eq 0 ]]; then
786792
echo "None"
787793
else
788794
for ((i=0 ; i<$len ; i++)); do
@@ -792,6 +798,13 @@ if [[ $option = info ]]; then
792798
echo -e " ${optdepends[$i]}"
793799
fi
794800
done
801+
for ((i=0 ; i<$len_carch ; i++)); do
802+
if [[ $i = 0 ]]; then
803+
echo "$(eval "echo \$$(echo {optdepends_${CARCH}[$i]})")"
804+
else
805+
echo -e " $(eval "echo \$$(echo {optdepends_${CARCH}[$i]})")"
806+
fi
807+
done
795808
fi
796809
797810
echo -e "${COLOR1}Conflicts With : ${ENDCOLOR}${conflicts[@]:-None}"

0 commit comments

Comments
 (0)