summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick McDermott <patrick.mcdermott@libiquity.com>2019-03-17 06:45:02 (EDT)
committer Patrick McDermott <patrick.mcdermott@libiquity.com>2019-03-17 06:45:02 (EDT)
commit59593299f75d59806fb90c92f239c91e730176e7 (patch)
tree14e4c906fca801b3ddc6cfecc16050e131f90ca0
parent8673b079dd056c1f60c2be228cafbc248dcb2907 (diff)
lib/package/2.sh: Fix _ob_package_dir case
This should have been done in commit 44d41cd.
-rw-r--r--lib/package/2.sh16
1 files changed, 8 insertions, 8 deletions
diff --git a/lib/package/2.sh b/lib/package/2.sh
index 9484ab5..4be68aa 100644
--- a/lib/package/2.sh
+++ b/lib/package/2.sh
@@ -27,13 +27,13 @@ _ob_parse_package_metadata_2()
{
local pkg=
- ob_parse_control "${_OB_PACKAGE_DIR}/control" _ob_srcfield_2 '' \
+ ob_parse_control "${_ob_package_dir}/control" _ob_srcfield_2 '' \
"${_OB_SOURCE_FIELDS_REQUIRED_2}" \
"${_OB_SOURCE_FIELDS_OPTIONAL_2}"
- ob_parse_changelog "${_OB_PACKAGE_DIR}/changelog" _ob_change_2
+ ob_parse_changelog "${_ob_package_dir}/changelog" _ob_change_2
for pkg in $(ob_get_binary_packages); do
- ob_parse_control "${_OB_PACKAGE_DIR}/${pkg}.pkg/control" \
+ ob_parse_control "${_ob_package_dir}/${pkg}.pkg/control" \
_ob_binfield_2 "${pkg}" \
"${_OB_BINARY_FIELDS_REQUIRED_2}" \
"${_OB_BINARY_FIELDS_OPTIONAL_2}"
@@ -47,7 +47,7 @@ _ob_get_binary_packages_2()
local pkgs=
local pkg_control=
- for pkg_control in "${_OB_PACKAGE_DIR}/"*'.pkg/control'; do
+ for pkg_control in "${_ob_package_dir}/"*'.pkg/control'; do
if [ ! -f "${pkg_control}" ]; then
continue
@@ -118,7 +118,7 @@ _ob_get_doc_package_2()
local doc_pkg=
for pkg in $(ob_get_binary_packages); do
- if [ -r "${_OB_PACKAGE_DIR}/${pkg}.pkg/docs" ]; then
+ if [ -r "${_ob_package_dir}/${pkg}.pkg/docs" ]; then
if [ -n "${doc_pkg}" ]; then
return 1
fi
@@ -146,7 +146,7 @@ _ob_get_doc_files_2()
../changelog changelog.dist
../README README.dist
EOF
- cat -- "${_OB_PACKAGE_DIR}/${doc_pkg}.pkg/docs"
+ cat -- "${_ob_package_dir}/${doc_pkg}.pkg/docs"
return 0
}
@@ -156,8 +156,8 @@ _ob_set_package_substvars_2()
local pkg="${1}"
shift 1 || _ob_abort
- if [ -f "${_OB_PACKAGE_DIR}/substvars" ]; then
- ob_parse_control "${_OB_PACKAGE_DIR}/substvars" \
+ if [ -f "${_ob_package_dir}/substvars" ]; then
+ ob_parse_control "${_ob_package_dir}/substvars" \
_ob_substvar_2 ''
fi