From 76b91e996a38ff95095d887639aee5a2a8eb4fa6 Mon Sep 17 00:00:00 2001
From: davidovski <david@davidovski.xyz>
Date: Sun, 29 May 2022 00:40:04 +0100
Subject: fixed postinstalls missing

---
 xi_buildscript.sh | 19 +++++++++----------
 xibuild.sh        |  2 +-
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/xi_buildscript.sh b/xi_buildscript.sh
index d9e19f7..a60efe9 100644
--- a/xi_buildscript.sh
+++ b/xi_buildscript.sh
@@ -55,23 +55,22 @@ for xibuild in $PKG_NAME.xibuild $(ls *.xibuild | grep -v "^$PKG_NAME.xibuild$")
 
         . ./$xibuild
 
-        
-        for t in $stages; do
-            type $t >/dev/null && {
-                echo "==========================$t stage=========================="
-                $t || exit 1
-            }
-        done
-
         printf "checking for postinstall... "
         if command -v postinstall > /dev/null; then 
             echo "adding postinstall"
             POST_DIR=$PKG_DEST/var/lib/xipkg/postinstall
             mkdir -p $POST_DIR
-            cat ./$PKG_NAME.xibuild > $POST_DIR/$PKG_NAME.sh
-            echo >> $POST_DIR/$PKG_NAME.sh
+            cat ./$PKG_NAME.xibuild $xibuild >> $POST_DIR/$PKG_NAME.sh
             echo "postinstall" >> $POST_DIR/$PKG_NAME.sh
         else
             echo "no postinstall"
         fi
+        
+        for t in $stages; do
+            type $t >/dev/null && {
+                echo "==========================$t stage=========================="
+                $t || exit 1
+            }
+        done
+
 done
diff --git a/xibuild.sh b/xibuild.sh
index b26e678..65a34f4 100644
--- a/xibuild.sh
+++ b/xibuild.sh
@@ -157,7 +157,7 @@ xibuild_package () {
             tar -C $root/$export_dir/$pkg -cJf $out_dir/$pkg.xipkg ./
         }
     done
-    for buildfile in $(find $src_dir -name "$src_dir/*.xibuild"); do
+    for buildfile in $(find $src_dir -name "*.xibuild"); do
         cp $buildfile $out_dir/
     done
 }
-- 
cgit v1.2.1