1 files changed, 13 insertions, 3 deletions
diff --git a/build-template b/build-template
index 5fe652c..7d51a3a 100755
--- a/build-template
+++ b/build-template
@@ -3,11 +3,21 @@
 rm -rf dst
 mkdir dst
 
-cat lib1.sh $1 lib2.sh | ./enter-newroot
+x=$1
+pkgname=${x##*/}
+x=${x%/*}
+pkgcat=${x##*/}
 
-for d in dst/*/*; do
+{
+  echo "export pkgname=$pkgname pkgcat=$pkgcat;"
+  cat lib1.sh $1 lib2.sh
+} | ./enter-newroot
+
+for d in dst/$pkgcat/$pkgname/*; do
   [ -d "$d" ] || continue
 
-  tar czvf pkg/$( echo "$d" | sed 's/^dst\///; s:/:@:g' ).tar.xz -C $d . --sort=name --mtime="@0" --owner=0 --group=0 --numeric-owner
+  mkdir -p pkg/$pkgcat
+  tar czvf pkg/$pkgcat/$pkgname@${d##*/}.tar.xz -C dst $pkgcat/$pkgname \
+    --sort=name --mtime="@0" --owner=0 --group=0 --numeric-owner
   echo $d
 done