summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick McDermott <patrick.mcdermott@libiquity.com>2019-03-18 13:27:40 (EDT)
committer Patrick McDermott <patrick.mcdermott@libiquity.com>2019-03-18 13:27:40 (EDT)
commit94c944e38be9f887794c017eaebbcc34788de057 (patch)
tree78ec3ac1edd89ff9d98d0e57cd3efe9187b1d0c0
parent2973e6672d8c7b9aac28f0f0e7756e929e59514d (diff)
ob-unpacksource: Improve upstream archive counting again
This builds on commit 2e837e5 (with fix in 10cfa1c) but uses newlines instead of spaces to separate upstream archives.
-rw-r--r--src/ob-unpacksource.sh5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/ob-unpacksource.sh b/src/ob-unpacksource.sh
index 83d1bb4..a4bb88d 100644
--- a/src/ob-unpacksource.sh
+++ b/src/ob-unpacksource.sh
@@ -38,14 +38,13 @@ unpack_native()
get_upstream_archive()
{
upstream_ar_base="${OPK_SOURCE}-${OPK_SOURCE_VERSION_UPSTREAM}.orig.tar"
- upstream_ar="$(printf '%s ' "../${upstream_ar_base}"*)"
- upstream_ar="${upstream_ar% }"
+ upstream_ar="$(printf '%s\n' "../${upstream_ar_base}"*)"
case "${upstream_ar}" in
"../${upstream_ar_base}*")
ob_info "$(ob_get_msg 'no_sources')"
return 1
;;
- *' '*)
+ *"${OB_LF}"*)
ob_error "$(ob_get_msg 'multiple_upstream_sources')"
return 1
;;