From 8a065771c7cceabbbdf8abdf4fa4accb7080a522 Mon Sep 17 00:00:00 2001
From: Jamil Bou Kheir <jamil@elbii.com>
Date: Thu, 8 Jul 2021 22:05:23 -0700
Subject: [PATCH] Add arch to debian package dirs

---
 .ci/build_deb.sh                                       | 10 ++++++----
 .../DEBIAN/control                                     |  0
 .../DEBIAN/postinst                                    |  0
 .../DEBIAN/templates                                   |  0
 .../lib/systemd/system/cloudfire.service               |  0
 .../DEBIAN/control                                     |  0
 .../DEBIAN/postinst                                    |  0
 .../DEBIAN/templates                                   |  0
 .../lib/systemd/system/cloudfire.service               |  0
 9 files changed, 6 insertions(+), 4 deletions(-)
 rename pkg/{ubuntu-18.04 => ubuntu-18.04_amd64}/DEBIAN/control (100%)
 rename pkg/{ubuntu-18.04 => ubuntu-18.04_amd64}/DEBIAN/postinst (100%)
 rename pkg/{ubuntu-18.04 => ubuntu-18.04_amd64}/DEBIAN/templates (100%)
 rename pkg/{ubuntu-18.04 => ubuntu-18.04_amd64}/lib/systemd/system/cloudfire.service (100%)
 rename pkg/{ubuntu-20.04 => ubuntu-20.04_amd64}/DEBIAN/control (100%)
 rename pkg/{ubuntu-20.04 => ubuntu-20.04_amd64}/DEBIAN/postinst (100%)
 rename pkg/{ubuntu-20.04 => ubuntu-20.04_amd64}/DEBIAN/templates (100%)
 rename pkg/{ubuntu-20.04 => ubuntu-20.04_amd64}/lib/systemd/system/cloudfire.service (100%)

diff --git a/.ci/build_deb.sh b/.ci/build_deb.sh
index 2a970f83e..f72689d19 100755
--- a/.ci/build_deb.sh
+++ b/.ci/build_deb.sh
@@ -2,8 +2,10 @@
 set -xe
 
 od=$(pwd)
-mkdir -p pkg/${MATRIX_OS}/opt/bin
-mv cloudfire-${MATRIX_ARCH} pkg/${MATRIX_OS}/opt/bin/cloudfire
+mkdir -p pkg/${MATRIX_OS}/opt/cloudfire/bin
+mv cloudfire-${MATRIX_ARCH} pkg/${MATRIX_OS}/opt/cloudfire/bin/cloudfire
 cd pkg
-dpkg-deb --build ${MATRIX_OS}
-mv -f ${MATRIX_OS}.deb ../cloudfire_${MATRIX_OS}_${MATRIX_ARCH}.deb
+dpkg-deb --build ${MATRIX_OS}_${MATRIX_ARCH}
+mv -f *.deb ../
+
+ls -lR ../
diff --git a/pkg/ubuntu-18.04/DEBIAN/control b/pkg/ubuntu-18.04_amd64/DEBIAN/control
similarity index 100%
rename from pkg/ubuntu-18.04/DEBIAN/control
rename to pkg/ubuntu-18.04_amd64/DEBIAN/control
diff --git a/pkg/ubuntu-18.04/DEBIAN/postinst b/pkg/ubuntu-18.04_amd64/DEBIAN/postinst
similarity index 100%
rename from pkg/ubuntu-18.04/DEBIAN/postinst
rename to pkg/ubuntu-18.04_amd64/DEBIAN/postinst
diff --git a/pkg/ubuntu-18.04/DEBIAN/templates b/pkg/ubuntu-18.04_amd64/DEBIAN/templates
similarity index 100%
rename from pkg/ubuntu-18.04/DEBIAN/templates
rename to pkg/ubuntu-18.04_amd64/DEBIAN/templates
diff --git a/pkg/ubuntu-18.04/lib/systemd/system/cloudfire.service b/pkg/ubuntu-18.04_amd64/lib/systemd/system/cloudfire.service
similarity index 100%
rename from pkg/ubuntu-18.04/lib/systemd/system/cloudfire.service
rename to pkg/ubuntu-18.04_amd64/lib/systemd/system/cloudfire.service
diff --git a/pkg/ubuntu-20.04/DEBIAN/control b/pkg/ubuntu-20.04_amd64/DEBIAN/control
similarity index 100%
rename from pkg/ubuntu-20.04/DEBIAN/control
rename to pkg/ubuntu-20.04_amd64/DEBIAN/control
diff --git a/pkg/ubuntu-20.04/DEBIAN/postinst b/pkg/ubuntu-20.04_amd64/DEBIAN/postinst
similarity index 100%
rename from pkg/ubuntu-20.04/DEBIAN/postinst
rename to pkg/ubuntu-20.04_amd64/DEBIAN/postinst
diff --git a/pkg/ubuntu-20.04/DEBIAN/templates b/pkg/ubuntu-20.04_amd64/DEBIAN/templates
similarity index 100%
rename from pkg/ubuntu-20.04/DEBIAN/templates
rename to pkg/ubuntu-20.04_amd64/DEBIAN/templates
diff --git a/pkg/ubuntu-20.04/lib/systemd/system/cloudfire.service b/pkg/ubuntu-20.04_amd64/lib/systemd/system/cloudfire.service
similarity index 100%
rename from pkg/ubuntu-20.04/lib/systemd/system/cloudfire.service
rename to pkg/ubuntu-20.04_amd64/lib/systemd/system/cloudfire.service