From c6bd16f39dfd69ee7aae65622784625c4a8b89cc Mon Sep 17 00:00:00 2001
From: Liam <33645555+lj3954@users.noreply.github.com>
Date: Tue, 30 Jul 2024 14:04:31 -0700
Subject: [PATCH 1/2] chore: Build linutil aarch64 binaries

---
 .github/workflows/linutil.yml      | 8 ++++++--
 .github/workflows/pre-release.yaml | 4 ++++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/linutil.yml b/.github/workflows/linutil.yml
index e801737b..a499d680 100644
--- a/.github/workflows/linutil.yml
+++ b/.github/workflows/linutil.yml
@@ -33,10 +33,14 @@ jobs:
         uses: dtolnay/rust-toolchain@stable
         with:
           targets: x86_64-unknown-linux-musl
-      - name: Build
+      - name: Install cross-rs for cross-compilation
+        run: cargo install cross
+      - name: Build x86_64 binary
         run: cargo build --target-dir=build --release --verbose --target=x86_64-unknown-linux-musl
+      - name: Build aarch64 binary
+        run: cross build --target-dir=build --release --verbose --target=aarch64-unknown-linux-musl
       - uses: stefanzweifel/git-auto-commit-action@v5
         with:
           commit_message: Commit Linutil
-          file_pattern: "build/x86_64-unknown-linux-musl/release/linutil"
+          file_pattern: "build/x86_64-unknown-linux-musl/release/linutil build/aarch64-unknown-linux-musl/release/linutil"
         if: success()
diff --git a/.github/workflows/pre-release.yaml b/.github/workflows/pre-release.yaml
index 5a64da69..194a43dc 100644
--- a/.github/workflows/pre-release.yaml
+++ b/.github/workflows/pre-release.yaml
@@ -21,6 +21,9 @@ jobs:
           echo "version=$version" >> $GITHUB_ENV
         shell: bash
 
+      - name: Rename aarch64 binary for release
+        run: mv ./build/aarch64-unknown-linux-musl/release/linutil ./build/aarch64-unknown-linux-musl/release/linutil-aarch64
+
       - name: Create and Upload Release
         id: create_release
         uses: softprops/action-gh-release@v2
@@ -31,6 +34,7 @@ jobs:
           append_body: false
           files: |
             ./build/x86_64-unknown-linux-musl/release/linutil
+            ./build/aarch64-unknown-linux-musl/release/linutil-aarch64
           prerelease: true
           generate_release_notes: true
         env:

From 5c348f9f49df9e518d06fd0f43b39ca3dbbc6f50 Mon Sep 17 00:00:00 2001
From: Liam <33645555+lj3954@users.noreply.github.com>
Date: Tue, 30 Jul 2024 14:04:46 -0700
Subject: [PATCH 2/2] feat: Add aarch64 compatibility to start.sh and
 startdev.sh

---
 start.sh    | 20 +++++++++++++++++---
 startdev.sh | 17 +++++++++++++++++
 2 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/start.sh b/start.sh
index 2590d9d3..d1e7658a 100755
--- a/start.sh
+++ b/start.sh
@@ -3,8 +3,6 @@
 rc='\033[0m'
 red='\033[0;31m'
 
-binary_url="https://github.com/ChrisTitusTech/linutil/releases/latest/download/linutil"
-
 check() {
     exit_code=$1
     message=$2
@@ -18,10 +16,26 @@ check() {
 	unset message
 }
 
+findArch() {
+    case "$(uname -m)" in
+        x86_64|amd64) arch="x86_64" ;;
+        aarch64|arm64) arch="aarch64" ;;
+        *) check 1 "Unsupported architecture"
+    esac
+}
+
+getUrl() {
+    case "${arch}" in
+        x86_64) echo "https://github.com/ChrisTitusTech/linutil/releases/latest/download/linutil";;
+        *) echo "https://github.com/ChrisTitusTech/linutil/releases/latest/download/linutil-${arch}";;
+    esac
+}
+
+findArch
 temp_file=$(mktemp)
 check $? "Creating the temporary file"
 
-curl -fsL "$binary_url" -o "$temp_file"
+curl -fsL "$(getUrl)" -o "$temp_file"
 check $? "Downloading linutil"
 
 chmod +x "$temp_file"
diff --git a/startdev.sh b/startdev.sh
index e51c09c3..2c5d5521 100755
--- a/startdev.sh
+++ b/startdev.sh
@@ -24,6 +24,7 @@ redirect_to_latest_pre_release() {
     echo "Using latest Full Release"
     url="https://github.com/ChrisTitusTech/linutil/releases/latest/download/linutil"
   fi
+  addArch
   echo "Using URL: $url"  # Log the URL being used
 }
 
@@ -37,6 +38,22 @@ check() {
     fi
 }
 
+addArch() {
+    case "${arch}" in
+        x86_64);;
+        *) url="${url}-${arch}";;
+    esac
+}
+
+findArch() {
+    case "$(uname -m)" in
+        x86_64|amd64) arch="x86_64" ;;
+        aarch64|arm64) arch="aarch64" ;;
+        *) check 1 "Unsupported architecture"
+    esac
+}
+
+findArch
 redirect_to_latest_pre_release
 
 TMPFILE=$(mktemp)