summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Reisner <dreisner@archlinux.org>2012-03-11 15:33:13 -0400
committerDan McGee <dan@archlinux.org>2012-04-08 17:42:37 -0500
commitecd6eddf13f0fc24a281b2af9725896492bb6ad4 (patch)
tree95d6493b6f0397c66d45eb693adb26cab700407c
parent87c4fb51a460b10153c10297bfaea7e5c16a811b (diff)
downloadpacman-ecd6eddf13f0fc24a281b2af9725896492bb6ad4.tar.xz
makepkg: use proper array addition in libdeps
Signed-off-by: Dave Reisner <dreisner@archlinux.org> Signed-off-by: Dan McGee <dan@archlinux.org>
-rw-r--r--scripts/makepkg.sh.in14
1 files changed, 7 insertions, 7 deletions
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index 3345cbd3..ac803a10 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -1091,7 +1091,7 @@ find_libdepends() {
if ! in_array "${soname}=${soversion}-${soarch}" ${libdepends[@]}; then
# libfoo.so=1-64
printf "%s" "${soname}=${soversion}-${soarch}"
- libdepends=(${libdepends[@]} "${soname}=${soversion}-${soarch}")
+ libdepends+=("${soname}=${soversion}-${soarch}")
fi
fi
done
@@ -1114,7 +1114,7 @@ find_libprovides() {
local sofile=$(LC_ALL=C readelf -d "$fn" 2>/dev/null | sed -n 's/.*Library soname: \[\(.*\)\].*/\1/p')
if [[ -z "$sofile" ]]; then
warning "$(gettext "Library listed in %s is not versioned: %s")" "'provides'" "$p"
- libprovides=(${libprovides[@]} "$p")
+ libprovides+=("$p")
continue
fi
@@ -1124,19 +1124,19 @@ find_libprovides() {
# extract the library major version
local soversion="${sofile##*\.so\.}"
- libprovides=(${libprovides[@]} "${p}=${soversion}-${soarch}")
+ libprovides+=("${p}=${soversion}-${soarch}")
else
warning "$(gettext "Library listed in %s is not a shared object: %s")" "'provides'" "$p"
- libprovides=(${libprovides[@]} "$p")
+ libprovides+=("$p")
fi
done
else
- libprovides=(${libprovides[@]} "$p")
+ libprovides+=("$p")
missing=1
fi
;;
*)
- libprovides=(${libprovides[@]} "$p")
+ libprovides+=("$p")
;;
esac
@@ -1203,7 +1203,7 @@ write_pkginfo() {
local it
libdepends=$(find_libdepends)
- depends=("${depends[@]}" ${libdepends})
+ depends+=(${libdepends})
for it in "${depends[@]}"; do
if [[ $it = *.so ]]; then