Skip to content

Commit

Permalink
Add support for architecture-specific arrays
Browse files Browse the repository at this point in the history
This will add support for depends and makedepends arrays that are
accompanied by an architecture name.

For example: depends_x86_64 and makedepends_i686.
  • Loading branch information
dbermond committed Feb 25, 2017
1 parent 3378ec5 commit 5e59650
Showing 1 changed file with 20 additions and 4 deletions.
24 changes: 20 additions & 4 deletions packer
Original file line number Diff line number Diff line change
Expand Up @@ -135,8 +135,11 @@ existsinlocal() {
scrapeaurdeps() {
pkginfo "$1" "$preview"
. "$tmpdir/$1.PKGBUILD"
local deps_carch=( $(eval "echo \$$(echo {depends_${CARCH}[@]})") )
local mkdeps_carch=( $(eval "echo \$$(echo {makedepends_${CARCH}[@]})") )
IFS=$'\n'
dependencies=( $(echo -e "${depends[*]}\n${makedepends[*]}" | sed -e 's/=.*//' -e 's/>.*//' -e 's/<.*//'| sort -u) )
dependencies=( $(echo -e "${depends[*]}\n${makedepends[*]}\n${deps_carch[*]}\n${mkdeps_carch[*]}" |
sed -e 's/=.*//' -e 's/>.*//' -e 's/<.*//'| sort -u) )
unset IFS
}

Expand Down Expand Up @@ -770,19 +773,25 @@ if [[ $option = info ]]; then

# Echo out the -Si formatted package information
# Retrieve each element in order and echo them immediately
depends_carch=( $(eval "echo \$$(echo {depends_${CARCH}[@]})") )
makedepends_carch=( $(eval "echo \$$(echo {makedepends_${CARCH}[@]})") )
IFS=$'\n'
optdepends_carch=( $(eval "echo \$$(echo {optdepends_${CARCH}[@]})") )
unset IFS
echo -e "${COLOR1}Repository : ${COLOR3}aur"
echo -e "${COLOR1}Name : $pkgname"
echo -e "${COLOR1}Version : ${COLOR2}$pkgver-$pkgrel"
echo -e "${COLOR1}URL : ${COLOR4}$url"
echo -e "${COLOR1}Licenses : ${ENDCOLOR}${license[@]}"
echo -e "${COLOR1}Groups : ${ENDCOLOR}${groups[@]:-None}"
echo -e "${COLOR1}Provides : ${ENDCOLOR}${provides[@]:-None}"
echo -e "${COLOR1}Depends On : ${ENDCOLOR}${depends[@]}"
echo -e "${COLOR1}Make Depends : ${ENDCOLOR}${makedepends[@]}"
echo -e "${COLOR1}Depends On : ${ENDCOLOR}${depends[@]} ${depends_carch[@]}"
echo -e "${COLOR1}Make Depends : ${ENDCOLOR}${makedepends[@]} ${makedepends_carch[@]}"
echo -e -n "${COLOR1}Optional Deps : ${ENDCOLOR}"

len="${#optdepends[@]}"
if [[ $len -eq 0 ]]; then
len_carch="${#optdepends_carch[@]}"
if [[ $len -eq 0 ]] && [[ $len_carch -eq 0 ]]; then
echo "None"
else
for ((i=0 ; i<$len ; i++)); do
Expand All @@ -792,6 +801,13 @@ if [[ $option = info ]]; then
echo -e " ${optdepends[$i]}"
fi
done
for ((i=0 ; i<$len_carch ; i++)); do
if [[ $i = 0 ]]; then
echo "${optdepends_carch[$i]}"
else
echo -e " ${optdepends_carch[$i]}"
fi
done
fi

echo -e "${COLOR1}Conflicts With : ${ENDCOLOR}${conflicts[@]:-None}"
Expand Down

0 comments on commit 5e59650

Please sign in to comment.