From 67b9b8694043512e8476ce095030c2842e4ef193 Mon Sep 17 00:00:00 2001
From: Nebula <me@itsnebula.net>
Date: Tue, 21 Mar 2023 18:11:41 -0400
Subject: [PATCH] fix: linux deb build and possibly macos

---
 .github/workflows/build.yml | 46 +++++++++++++++++--------------------
 1 file changed, 21 insertions(+), 25 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 9ef8916..5bb5541 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -382,8 +382,8 @@ jobs:
           mkdir -p stage/DEBIAN
           mkdir -p stage/opt/procursus/usr/bin
           mkdir -p stage/opt/procursus/usr/share/man/man1
+          cp packaging/control static.DEBIAN/control
           cd stage
-          cp ../packaging/control DEBIAN/control
 
           gsed 's|@DEB_ARCH@|darwin-amd64|g' -i DEBIAN/control
           gsed 's|@DEB_VERSION@|$(cat {{ github.workspace }}/version)|g' -i DEBIAN/control
@@ -400,8 +400,8 @@ jobs:
           mkdir -p stage/DEBIAN
           mkdir -p stage/opt/procursus/usr/bin
           mkdir -p stage/opt/procursus/usr/share/man/man1
+          cp packaging/control static.DEBIAN/control
           cd stage
-          cp ../packaging/control DEBIAN/control
 
           gsed 's|@DEB_ARCH@|darwin-arm64|g' -i DEBIAN/control
           gsed 's|@DEB_VERSION@|$(cat {{ github.workspace }}/version)|g' -i DEBIAN/control
@@ -418,8 +418,8 @@ jobs:
           mkdir -p stage/DEBIAN
           mkdir -p stage/usr/bin
           mkdir -p stage/usr/share/man/man1
+          cp packaging/control static.DEBIAN/control
           cd stage
-          cp ../packaging/control DEBIAN/control
 
           gsed 's|@DEB_ARCH@|iphoneos-arm|g' -i DEBIAN/control
           gsed 's|@DEB_VERSION@|$(cat {{ github.workspace }}/version)|g' -i DEBIAN/control
@@ -436,8 +436,8 @@ jobs:
           mkdir -p stage/DEBIAN
           mkdir -p stage/var/jb/usr/bin
           mkdir -p stage/var/jb/usr/share/man/man1
+          cp packaging/control static.DEBIAN/control
           cd stage
-          cp ../packaging/control DEBIAN/control
 
           gsed 's|@DEB_ARCH@|iphoneos-arm64|g' -i DEBIAN/control
           gsed 's|@DEB_VERSION@|$(cat {{ github.workspace }}/version)|g' -i DEBIAN/control
@@ -736,35 +736,31 @@ jobs:
 
       - name: Build debs
         run: |
-          # Linux amd64
+          case ${{ matrix.triple }} in
+            i486-linux-musl)
+              echo "ARCH_NAME=i386" >> $GITHUB_ENV
+              ;;
+            x86_64-linux-musl)
+              echo "ARCH_NAME=amd64" >> $GITHUB_ENV
+              ;;
+            armel-linux-musleabi)
+              echo "ARCH_NAME=armel" >> $GITHUB_ENV
+              ;;
+            aarch64-linux-musl)
+              echo "ARCH_NAME=arm64" >> $GITHUB_ENV
+              ;;
+          esac
+
           mkdir -p stage/DEBIAN
           mkdir -p stage/usr/bin
           mkdir -p stage/usr/share/man/man1
           cd stage
           cp ../packaging/control DEBIAN/control
 
-          sed 's|@DEB_ARCH@|amd64|g' -i DEBIAN/control
+          sed 's|@DEB_ARCH@|${{ env.ARCH_NAME }}|g' -i DEBIAN/control
           sed 's|@DEB_VERSION@|$(cat {{ github.workspace }}/version)|g' -i DEBIAN/control
           
-          install -Dm644 ../ready/palera1n-macos-x86_64 usr/bin/palera1n
-          install -Dm644 ../ready/palera1n.1 usr/share/man/man1/palera1n.1
-
-          cd ..
-          dpkg-deb -b stage .
-          mv palera1n*.deb ready/
-          rm -rf stage
-
-          # Linux arm64
-          mkdir -p stage/DEBIAN
-          mkdir -p stage/usr/bin
-          mkdir -p stage/usr/share/man/man1
-          cd stage
-          cp ../packaging/control DEBIAN/control
-
-          sed 's|@DEB_ARCH@|arm64|g' -i DEBIAN/control
-          sed 's|@DEB_VERSION@|$(cat {{ github.workspace }}/version)|g' -i DEBIAN/control
-          
-          install -Dm644 ../ready/palera1n-macos-arm64 usr/bin/palera1n
+          install -Dm644 ../ready/palera1n-${{ env.CHECKRA1N_NAME }} usr/bin/palera1n
           install -Dm644 ../ready/palera1n.1 usr/share/man/man1/palera1n.1
 
           cd ..