From fd8b089522dca7f3f7c56fc4c34a4c7271eede01 Mon Sep 17 00:00:00 2001
From: leafee98 <leafee98@hotmail.com>
Date: Fri, 24 Mar 2023 15:51:39 +0800
Subject: [PATCH] [WIP] refactor generate_deb

---
 makedeb | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/makedeb b/makedeb
index c0ec680..5f9e928 100755
--- a/makedeb
+++ b/makedeb
@@ -2,8 +2,8 @@
 
 WORKSPACE=$(pwd -P)
 
-export srcdir="${WORKSPACE}/src/"
-export pkgdir="${WORKSPACE}/pkg/"
+export srcdir="${WORKSPACE}/src"
+export pkgdir="${WORKSPACE}/pkg"
 
 FAKE_PACKAGE=0
 OVERRIDE_SOURCE=0
@@ -59,12 +59,14 @@ EOF
 
 function generate_deb {
     (
-        cd "${pkgdir}"
-        tar czf ../data.tar.gz [a-z]*
-        cd  DEBIAN
-        tar czf ../../control.tar.gz *
-        cd ../..
+        find "${pkgdir}" -mindepth 1 -not -type d -not -path "${pkgdir}/DEBIAN*" -printf "%P\n" |
+            tar -czf data.tar.gz -C "${pkgdir}" -T -
+
+        find "${pkgdir}/DEBIAN" -mindepth 1 -not -type d -printf "%P\n" |
+            tar -czf control.tar.gz -C "${pkgdir}/DEBIAN" -T -
+
         echo 2.0 > debian-binary
+
         ar r "${pkgname}${pkgver:+-}${pkgver}.deb" debian-binary control.tar.gz data.tar.gz
         rm debian-binary control.tar.gz data.tar.gz
     )