From 8556fafd3dc3c57073aadce261b38fbd14878c2e Mon Sep 17 00:00:00 2001
From: tali <iitalics@gmail.com>
Date: Fri, 2 Feb 2024 13:33:47 -0500
Subject: [PATCH] fixup deploy script

---
 deploy/_build.sh | 26 ++++++++++++++++++--------
 deploy/deploy.sh |  2 --
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/deploy/_build.sh b/deploy/_build.sh
index 737e897..f91f86e 100755
--- a/deploy/_build.sh
+++ b/deploy/_build.sh
@@ -8,25 +8,35 @@ root=dist/root
 rm -rf $root
 mkdir -p $root/DEBIAN $root/etc $root/usr/lib/systemd/system
 
+# build ocaml program
+
 opam pin add ./talircd --kind=path --no-action --yes
 opam install talircd --destdir=$root/usr --yes
 
+# install helper files
+
+install -m 644 talircd/deploy/talircd.service $root/usr/lib/systemd/system
+install -m 644 talircd/deploy/talircd.conf $root/etc
+
+# generate package control file
+
 pkg=$(opam info talircd -fname)
 ver="$(opam info talircd -fversion)"
 rev=0
 dsc="$(opam info talircd -fdescription)"
 mtr="iitalics"
+arch="$(dpkg-architecture -q DEB_TARGET_ARCH)"
+
 control=$root/DEBIAN/control
 
 set -x
 
-echo "Package: ${pkg}"      > $control
-echo "Version: ${ver}"     >> $control
-echo "Description: ${dsc}" >> $control
-echo "Maintainer: ${mtr}"  >> $control
-echo "Architecture: all"   >> $control
+echo "Package: ${pkg}"        > $control
+echo "Version: ${ver}"       >> $control
+echo "Description: ${dsc}"   >> $control
+echo "Maintainer: ${mtr}"    >> $control
+echo "Architecture: ${arch}" >> $control
 
-install -m 644 talircd/deploy/talircd.service $root/usr/lib/systemd/system
-install -m 644 talircd/deploy/talircd.conf $root/etc
+# generate .deb
 
-dpkg-deb --root-owner-group -b $root "dist/${pkg}_${ver}-${rev}_all.deb"
+dpkg-deb --root-owner-group -b $root "dist/${pkg}_${ver}-${rev}_${arch}.deb"
diff --git a/deploy/deploy.sh b/deploy/deploy.sh
index 30ad673..e9d4dec 100755
--- a/deploy/deploy.sh
+++ b/deploy/deploy.sh
@@ -56,5 +56,3 @@ case ${1:-build} in
     *)
       echo "invalid command $1"
 esac
-
-# mkdir -p "${DIST_DIR}"