From d280b6e7d61a76cb31a6bc16b485c2d006737583 Mon Sep 17 00:00:00 2001 From: Jay Freeman Date: Tue, 27 Jan 2009 21:27:25 +0000 Subject: Numerous updates for people trying to use this environment. git-svn-id: http://svn.telesphoreo.org/trunk@545 514c082c-b64e-11dc-b46d-3d985efe055d --- helper.sh | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) (limited to 'helper.sh') diff --git a/helper.sh b/helper.sh index 69dc93089..04af080f7 100755 --- a/helper.sh +++ b/helper.sh @@ -7,22 +7,24 @@ export PKG_CCPF=$("${PKG_TARG}-gcc" -v 2>&1 | grep -- --prefix | sed -e 's/.*--p source "${PKG_BASE}/folders.sh" -export PKG_DATA=$(PKG_DATA_ "${PKG_NAME}") -export PKG_WORK=$(PKG_WORK_ "${PKG_NAME}") -export PKG_DEST=$(PKG_DEST_ "${PKG_NAME}") +if [[ ${PKG_NAME} != @(-|:*) ]]; then + export PKG_DATA=$(PKG_DATA_ "${PKG_NAME}") + export PKG_WORK=$(PKG_WORK_ "${PKG_NAME}") + export PKG_DEST=$(PKG_DEST_ "${PKG_NAME}") -export PKG_STAT=${PKG_BASE}/stat/${PKG_ARCH}/${PKG_NAME} -export PKG_DATA=$(echo "${PKG_BASE}"/data/"${PKG_NAME}"?(_)) -export PKG_VRSN=$(cat "${PKG_DATA}/_metadata/version") -export PKG_PRIO=$(cat "${PKG_DATA}/_metadata/priority") -export PKG_RVSN=$(cat "${PKG_STAT}/dest-ver" 2>/dev/null) + export PKG_STAT=${PKG_BASE}/stat/${PKG_ARCH}/${PKG_NAME} + export PKG_DATA=$(echo "${PKG_BASE}"/data/"${PKG_NAME}"?(_)) + export PKG_VRSN=$(cat "${PKG_DATA}/_metadata/version") + export PKG_PRIO=$(cat "${PKG_DATA}/_metadata/priority") + export PKG_RVSN=$(cat "${PKG_STAT}/dest-ver" 2>/dev/null) -if [[ ! -e ${PKG_DATA} ]]; then - echo "unknown package: ${PKG_NAME}" 1>&2 - exit 1 -fi + if [[ ! -e ${PKG_DATA} ]]; then + echo "unknown package: ${PKG_NAME}" 1>&2 + exit 1 + fi -declare -a PKG_DEPS -for dep in "${PKG_DATA}"/_metadata/*.dep; do - PKG_DEPS[${#PKG_DEPS[@]}]=$(basename "${dep}" .dep) -done + declare -a PKG_DEPS + for dep in "${PKG_DATA}"/_metadata/*.dep; do + PKG_DEPS[${#PKG_DEPS[@]}]=$(basename "${dep}" .dep) + done +fi -- cgit v1.2.3