From 24f6d59354df69788c96f26e8c046a50c383c886 Mon Sep 17 00:00:00 2001
From: Sam Bingner <sam@bingner.com>
Date: Fri, 12 Oct 2018 16:47:06 -1000
Subject: Build environment changes

---
 package.sh | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

(limited to 'package.sh')

diff --git a/package.sh b/package.sh
index 10775ddb2..25db5b39b 100755
--- a/package.sh
+++ b/package.sh
@@ -7,10 +7,6 @@ if [[ $# == 0 ]]; then
     exit
 fi
 
-if [[ $UID -ne 0 ]]; then
-    exec fakeroot "$0" "$@"
-fi
-
 export PKG_MAKE=$0
 export PKG_NAME=${1%_}
 
@@ -32,7 +28,11 @@ pkg: mkdir -p /DEBIAN
 for script in preinst extrainst_ postinst prerm postrm; do
     if [[ -e "${PKG_DATA}/_metadata/${script}.c" ]]; then
         ./exec.sh - "${PKG_TARG}-gcc" -o "$(pkg_ /DEBIAN)/${script}" "${PKG_DATA}/_metadata/${script}.c"
-        ./exec.sh - ldid -S "$(pkg_ /DEBIAN)/${script}"
+				if [[ -e "${PKG_BASE}/arch/${PKG_ARCH}/${PKG_CFTARG}/entitlement.xml" ]]; then
+            ./exec.sh - ldid -S"${PKG_BASE}/arch/${PKG_ARCH}/${PKG_CFTARG}/entitlement.xml" "$(pkg_ /DEBIAN)/${script}"
+				else
+            ./exec.sh - ldid -S "$(pkg_ /DEBIAN)/${script}"
+				fi
     elif [[ -e "${PKG_DATA}/_metadata/${script}" ]]; then
         cp -a "${PKG_DATA}/_metadata/${script}" "$(pkg_ /DEBIAN)"
     fi
@@ -54,15 +54,20 @@ else
         PKG_RVSN=$((${PKG_RVSN} + 1))
     fi
 
-    export PKG_PACK=${PKG_BASE}/debs/${PKG_NAME}_${PKG_VRSN}-${PKG_RVSN}_${PKG_ARCH}.deb
+		if [[ ! -d "${PKG_BASE}/debs/${PKG_CFTARG}" ]]; then
+		    mkdir -p "${PKG_BASE}/debs/${PKG_CFTARG}"
+		fi
+    export PKG_PACK=${PKG_BASE}/debs/${PKG_CFTARG}/${PKG_NAME}_${PKG_VRSN}-${PKG_RVSN}_${PKG_ARCH}.deb
     if [[ -e ${PKG_PACK} ]]; then
         echo "package ${PKG_PACK} already exists..."
     else
         ./control.sh "${PKG_NAME}" control "${PKG_VRSN}-${PKG_RVSN}" >"$(pkg_ /DEBIAN/control)"
-        dpkg-deb -Z"${PKG_ZLIB}" -b "${PKG_DEST}" "${PKG_PACK}"
+        fakeroot dm.pl -Z"${PKG_ZLIB}" -b "${PKG_DEST}" "${PKG_PACK}"
         echo "${PKG_HASH}" >"${PKG_STAT}/dest-md5"
         echo "${PKG_RVSN}" >"${PKG_STAT}/dest-ver"
-        "${PKG_BASE}"/upload.sh debs "${PKG_PACK}"
+        if [[ -e "${PKG_BASE}"/upload.sh ]]; then
+            "${PKG_BASE}"/upload.sh debs "${PKG_PACK}"
+        fi
     fi
 fi
 
-- 
cgit v1.2.3