From 33cb68d9acf7ca56601d147c1ff9a81bd07e0a78 Mon Sep 17 00:00:00 2001
From: Sam Bingner <sam@bingner.com>
Date: Tue, 11 Dec 2018 21:00:53 -1000
Subject: Repackage if file is missing

---
 package.sh | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

(limited to 'package.sh')

diff --git a/package.sh b/package.sh
index 25db5b39b..2d683a8ba 100755
--- a/package.sh
+++ b/package.sh
@@ -44,19 +44,23 @@ fi
 
 export PKG_HASH=$(util/catdir.sh "${PKG_DEST}" | md5sum | cut -d ' ' -f 1)
 echo "hashed dest ${PKG_NAME} to: ${PKG_HASH}"
+NEED_PACK=0
 
-if [[ -e "${PKG_STAT}/dest-md5" && ${PKG_HASH} == $(cat "${PKG_STAT}/dest-md5" 2>/dev/null) ]]; then
-    echo "skipping re-package of ${PKG_NAME}"
-else
+if [[ -z ${PKG_RVSN} || ! -e "${PKG_STAT}/dest-md5" || ${PKG_HASH} != $(cat "${PKG_STAT}/dest-md5" 2>/dev/null) ]]; then
     if [[ -z ${PKG_RVSN} ]]; then
         PKG_RVSN=1
     else
         PKG_RVSN=$((${PKG_RVSN} + 1))
     fi
-
-		if [[ ! -d "${PKG_BASE}/debs/${PKG_CFTARG}" ]]; then
-		    mkdir -p "${PKG_BASE}/debs/${PKG_CFTARG}"
-		fi
+    NEED_PACK=1
+fi
+export PKG_PACK=${PKG_BASE}/debs/${PKG_CFTARG}/${PKG_NAME}_${PKG_VRSN}-${PKG_RVSN}_${PKG_ARCH}.deb
+if [[ ${NEED_PACK} == 0 && -f "${PKG_PACK}" ]]; then
+    echo "skipping re-package of ${PKG_NAME}"
+else
+    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..."
-- 
cgit v1.2.3