From 5339f79f732484faa6a77b2b2d2619f8baca341e Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Fri, 29 Mar 2013 14:17:34 +0100
Subject: [PATCH] scripts/unpack: refactor PKG_BUILD detection

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 scripts/unpack | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/scripts/unpack b/scripts/unpack
index eaf3673a55..45c4c01fdd 100755
--- a/scripts/unpack
+++ b/scripts/unpack
@@ -73,9 +73,17 @@ if [ -d "$PKG_DIR/sources" ]; then
   cp -PRf $PKG_DIR/sources/* $BUILD/${PKG_NAME}-${PKG_VERSION}
 fi
 
-[ -d $BUILD/${PKG_NAME}[-_.]${PKG_VERSION} ] && PKG_BUILD=`ls -d $BUILD/${PKG_NAME}[-_.]${PKG_VERSION}`
-[ -d $BUILD/${PKG_NAME}${PKG_VERSION} ] && PKG_BUILD=`ls -d $BUILD/${PKG_NAME}${PKG_VERSION}`
-[ -d $BUILD/${PKG_NAME} ] && PKG_BUILD=`ls -d $BUILD/${PKG_NAME}`
+if [ -d "$BUILD/${PKG_NAME}-${PKG_VERSION}" ]; then
+  PKG_BUILD="$BUILD/${PKG_NAME}-${PKG_VERSION}"
+elif [ -d "$BUILD/${PKG_NAME}_${PKG_VERSION}" ]; then
+  PKG_BUILD="$BUILD/${PKG_NAME}_${PKG_VERSION}"
+elif [ -d "$BUILD/${PKG_NAME}.${PKG_VERSION}" ]; then
+  PKG_BUILD="$BUILD/${PKG_NAME}.${PKG_VERSION}"
+elif [ -d "$BUILD/${PKG_NAME}${PKG_VERSION}" ]; then
+  PKG_BUILD="$BUILD/${PKG_NAME}${PKG_VERSION}"
+elif [ -d "$BUILD/${PKG_NAME}" ]; then
+  PKG_BUILD="$BUILD/${PKG_NAME}"
+fi
 
 for i in $PKG_DIR/patches/$PKG_NAME-*.patch ; do
   if [ -f "$i" ]; then