From 94c944e38be9f887794c017eaebbcc34788de057 Mon Sep 17 00:00:00 2001 From: Patrick McDermott Date: Mon, 18 Mar 2019 13:27:40 -0400 Subject: 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. --- 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 ;; -- cgit v0.9.1