From abdd9a04698a4a77058d83ed0dae59d3053618f7 Mon Sep 17 00:00:00 2001 From: Sam Bingner Date: Mon, 23 Mar 2020 14:40:26 -1000 Subject: Infrastructure to build a metapackage and _librsync metapackage --- folders.sh | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) (limited to 'folders.sh') diff --git a/folders.sh b/folders.sh index c46c5f525..3c0419673 100755 --- a/folders.sh +++ b/folders.sh @@ -1,23 +1,39 @@ #!/bin/bash function PKG_DATA_() { - echo "${PKG_BASE}/data/$1" + if [[ -n "${PKG_PARENT}" && "$1" != "${PKG_PARENT}" ]]; then + echo "${PKG_BASE}/data/${PKG_PARENT}" + else + echo "${PKG_BASE}/data/$1" + fi } export -f PKG_DATA_ function PKG_WORK_() { - echo "${PKG_BASE}/work/${PKG_ARCH}/${PKG_CFTARG}/$1" + if [[ -n "${PKG_PARENT}" && "$1" != "${PKG_PARENT}" ]]; then + echo "${PKG_BASE}/work/${PKG_ARCH}/${PKG_CFTARG}/${PKG_PARENT}" + else + echo "${PKG_BASE}/work/${PKG_ARCH}/${PKG_CFTARG}/$1" + fi } export -f PKG_WORK_ function PKG_MORE_() { - echo "${PKG_BASE}/more/${PKG_ARCH}/${PKG_CFTARG}/$1" + if [[ -n "${PKG_PARENT}" && "$1" != "${PKG_PARENT}" ]]; then + echo "${PKG_BASE}/more/${PKG_ARCH}/${PKG_CFTARG}/$PKG_PARENT" + else + echo "${PKG_BASE}/more/${PKG_ARCH}/${PKG_CFTARG}/$1" + fi } function PKG_DEST_() { - echo "${PKG_BASE}/dest/${PKG_ARCH}/${PKG_CFTARG}/$1" + if [[ -n "${PKG_PARENT}" && "$1" != "${PKG_PARENT}" ]]; then + echo "${PKG_BASE}/subdest/${PKG_ARCH}/${PKG_CFTARG}/${PKG_PARENT}/$1" + else + echo "${PKG_BASE}/dest/${PKG_ARCH}/${PKG_CFTARG}/$1" + fi } export -f PKG_DEST_ -- cgit v1.2.3