From 4fdcedecbe98033acb61517b2f52173491a7d877 Mon Sep 17 00:00:00 2001
From: Yui-Patch Automator <owner.dsf@gmail.com>
Date: Wed, 12 Feb 2025 22:47:45 +0530
Subject: [PATCH 01/24] Update cp_latest_dispatch.yml

---
 .github/workflows/cp_latest_dispatch.yml | 120 ++++++++++++++++++-----
 1 file changed, 97 insertions(+), 23 deletions(-)

diff --git a/.github/workflows/cp_latest_dispatch.yml b/.github/workflows/cp_latest_dispatch.yml
index 43e1b91f..131cfaeb 100644
--- a/.github/workflows/cp_latest_dispatch.yml
+++ b/.github/workflows/cp_latest_dispatch.yml
@@ -2,10 +2,53 @@ name: Latest Version - Workflow Dispatch
 
 on:
   workflow_dispatch:
+    inputs:
+      os-and-arch:
+        description: 'Operating System And Architecture'
+        required: true
+        default: '6.0.0'
+        type: choice
+        options:
+          - Windows (x86_64)
+          - Linux (x86_64)
+          - Mac (arm64)
+          - Mac (arm64e)
+          - Mac (x86_64)
+
+env:
+  OS_ARCH: ${{ github.event.inputs.os-and-arch }}
 
 jobs:
+
+  init_os_arch:
+    runs-on: windows-latest
+    outputs:
+      library_extension:  ${{ steps.set_library_extension.outputs.library_extension }}
+
+    steps:
+      - name: Set Library Extension (dll / so / dylib)
+        id: set_library_extension
+        shell: pwsh
+        run: |
+          $extension = 'not-selected'
+    
+          if ($env:OS_ARCH -eq 'Windows (x86_64)') {
+            $extension = 'dll'
+          } elseif ($env:OS_ARCH -eq 'Linux (x86_64)') {
+            $extension = 'so'
+          } elseif ($env:OS_ARCH -eq 'Mac (arm64)' -or $env:OS_ARCH -eq 'Mac (arm64e)' -or $env:OS_ARCH -eq 'Mac (x86_64)') {
+            $extension = 'dylib'
+          } else {
+            throw "Unsupported OS architecture: $env:OS_ARCH"
+          }
+          
+          "library_extension=$extension" | Out-File -Append -FilePath $env:GITHUB_OUTPUT
+
   scrape_fe_version:
     runs-on: windows-latest
+    needs:
+      - init_os_arch
+    
     outputs:
       scraped_version: ${{ steps.set_scraped_version.outputs.scraped_version }}
 
@@ -43,6 +86,7 @@ jobs:
 
     env: 
       SCRAPED_VERSION: ${{ needs.scrape_fe_version.outputs.scraped_version }}
+      LIBRARY_EXTENSION: ${{ needs.init_os_arch.outputs.library_extension }}
       
     outputs:
       is-compatible-cont: ${{ steps.is-compatible-cont.outputs.is-compatible-cont }}
@@ -71,21 +115,16 @@ jobs:
         id: is-compatible-cont
         run: echo "is-compatible-cont=${{ env.IS_COMPATIBLE_CONT }}" | Out-File -Append -FilePath $env:GITHUB_OUTPUT
 
-      - name: Set Yui name  (>= 5.17.0)
-        if: env.IS_COMPATIBLE_CONT == 'true'
+      - name: Set Yui name 
         run: echo "YUI_NAME=yui" | Out-File -Append -FilePath $env:GITHUB_ENV
-
-      - name: Set Yui name  (< 5.17.0)
-        if: env.IS_COMPATIBLE_CONT == 'false'
-        run: echo "YUI_NAME=yukihana" | Out-File -Append -FilePath $env:GITHUB_ENV
         
       - name: Set Yui fiddler name (>= 5.17.0)
         if: env.IS_COMPATIBLE_CONT == 'true'
-        run: echo "Yui_FIDDLER_NAME=fiddler" | Out-File -Append -FilePath $env:GITHUB_ENV
+        run: echo "Yui_FIDDLER_NAME=fiddler.$env:LIBRARY_EXTENSION" | Out-File -Append -FilePath $env:GITHUB_ENV
 
-      - name: Set Yui fiddler name (< 5.17.0)
-        if: env.IS_COMPATIBLE_CONT == 'false'
-        run: echo "Yui_FIDDLER_NAME=libfiddler" | Out-File -Append -FilePath $env:GITHUB_ENV
+      - name: Set Yui fiddler name (< 5.17.0 or on linux)
+        if: env.IS_COMPATIBLE_CONT == 'false' || env.OS_ARCH == 'Linux (x86_64)'
+        run: echo "Yui_FIDDLER_NAME=libfiddler.$env:LIBRARY_EXTENSION" | Out-File -Append -FilePath $env:GITHUB_ENV
 
       - name: Set Yui_FIDDLER_NAME as Output
         id: Yui-fiddler-name
@@ -98,26 +137,22 @@ jobs:
           }
         shell: pwsh
 
-      - name: Set Yui Release (>= 5.17.0)
-        if: env.IS_COMPATIBLE_CONT == 'true'
+      - name: Set Yui Release
+        if: env.IS_COMPATIBLE_CONT == 'true' 
         run: echo "Yui_RELEASE=continuous" | Out-File -Append -FilePath $env:GITHUB_ENV
-
-      - name: Set Yui Release (< 5.17.0) 
-        if: env.IS_COMPATIBLE_CONT == 'false'
-        run: echo "Yui_RELEASE=v1.0.9" | Out-File -Append -FilePath $env:GITHUB_ENV
         
       - name: Download Yui Patch
         run: |
           try {
             # Build the download URLs
-            $YuiFiddlerUrl = "https://github.com/project-yui/Yui-patch/releases/download/$env:Yui_RELEASE/$env:YUI_NAME-$env:Yui_FIDDLER_NAME-win32-x86_64-$env:Yui_RELEASE.dll"
+            $YuiFiddlerUrl = "https://github.com/project-yui/Yui-patch/releases/download/$env:Yui_RELEASE/$env:YUI_NAME-fiddler-win32-x86_64-$env:Yui_RELEASE.$env:LIBRARY_EXTENSION"
             
             # Print the URLs to ensure they're correct
             Write-Host "Downloading files from $env:Yui_RELEASE"
             Write-Host "Yui Fiddler URL: $YuiFiddlerUrl"
 
             # Download the files
-            Invoke-WebRequest -Uri $YuiFiddlerUrl -OutFile "Yui\$env:Yui_FIDDLER_NAME.dll"
+            Invoke-WebRequest -Uri $YuiFiddlerUrl -OutFile "Yui\$env:Yui_FIDDLER_NAME"
           }
           catch {
             Write-Error "Failed to download the patch files. Error details: $_"
@@ -162,9 +197,9 @@ jobs:
           path: msojocs/
           if-no-files-found: error
 
-  download-fiddler-everywhere:
+  download-fiddler-everywhere-windows:
+    if: env.OS_ARCH == 'Windows (x86_64)'
     runs-on: windows-latest
-
     needs: 
       - scrape_fe_version
 
@@ -202,13 +237,52 @@ jobs:
           path: fe_app64/
           if-no-files-found: error
 
+  download-fiddler-everywhere-linux:
+    if: env.OS_ARCH == 'Linux (x86_64)'
+    runs-on: ubuntu-latest
+    needs: 
+      - scrape_fe_version
+
+    steps:
+      - name: Build URL & Download
+        run: |
+          # Retrieve the scraped version from the previous step
+          $scrapedVersion = "${{ needs.scrape_fe_version.outputs.scraped_version }}"
+          
+          # Check if the scraped version is available
+          if (-not [string]::IsNullOrEmpty($scrapedVersion)) {
+            $downloadUrl = "https://downloads.getfiddler.com/linux/fiddler-everywhere-$scrapedVersion.AppImage"
+          
+            Write-Host "Download URL: $downloadUrl"
+
+            Invoke-WebRequest -Uri $downloadUrl -OutFile "FiddlerEverywhereSetup.AppImage"
+            
+          } else {
+            Write-Host "SCRAPED_VERSION is empty or not set"
+            exit 1
+          }
+        shell: pwsh
+
+      - name: Extract AppImage 
+        run: |
+          ./FiddlerEverywhereSetup.AppImage --appimage-extract
+          ls -l
+        
+      - name: Upload Fiddler Everywhere Extracted folder as an artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: fe_app64
+          path: fe_app64/
+          if-no-files-found: error      
+
   patch_fe:
     runs-on: windows-latest
 
     needs:
       - download-Yui-patch
       - download-msojocs-server
-      - download-fiddler-everywhere
+      - download-fiddler-everywhere-windows
+      - download-fiddler-everywhere-linux
       - scrape_fe_version
 
     env:
@@ -248,8 +322,8 @@ jobs:
 
       - name: Patch fiddler.dll / libfiddler.dll
         run: |
-          $original_fiddler = "FE/${{ needs.download-Yui-patch.outputs.Yui-fiddler-name }}.dll"
-          $Yui_fiddler = "Yui-patch/${{ needs.download-Yui-patch.outputs.Yui-fiddler-name }}.dll"
+          $original_fiddler = "FE/${{ needs.download-Yui-patch.outputs.Yui-fiddler-name }}"
+          $Yui_fiddler = "Yui-patch/${{ needs.download-Yui-patch.outputs.Yui-fiddler-name }}"
           
           if ((Test-Path $original_fiddler) -and (Test-Path $Yui_fiddler)) {
             Copy-Item -Path $Yui_fiddler -Destination $original_fiddler -Force

From d1d820f93f34dd73f7f33df66bc9f4fbb9e5f215 Mon Sep 17 00:00:00 2001
From: Yui-Patch Automator <owner.dsf@gmail.com>
Date: Wed, 12 Feb 2025 22:51:38 +0530
Subject: [PATCH 02/24] Update cp_latest_dispatch.yml

---
 .github/workflows/cp_latest_dispatch.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/cp_latest_dispatch.yml b/.github/workflows/cp_latest_dispatch.yml
index 131cfaeb..c6af690f 100644
--- a/.github/workflows/cp_latest_dispatch.yml
+++ b/.github/workflows/cp_latest_dispatch.yml
@@ -198,7 +198,7 @@ jobs:
           if-no-files-found: error
 
   download-fiddler-everywhere-windows:
-    if: env.OS_ARCH == 'Windows (x86_64)'
+    if: ${{ env.OS_ARCH == 'Windows (x86_64)' }}
     runs-on: windows-latest
     needs: 
       - scrape_fe_version
@@ -238,7 +238,7 @@ jobs:
           if-no-files-found: error
 
   download-fiddler-everywhere-linux:
-    if: env.OS_ARCH == 'Linux (x86_64)'
+    if: ${{ env.OS_ARCH == 'Linux (x86_64)' }}
     runs-on: ubuntu-latest
     needs: 
       - scrape_fe_version

From 45a0b01efde64df50953afad9c216e2f84a3d567 Mon Sep 17 00:00:00 2001
From: Yui-Patch Automator <owner.dsf@gmail.com>
Date: Wed, 12 Feb 2025 22:57:49 +0530
Subject: [PATCH 03/24] Update cp_latest_dispatch.yml

---
 .github/workflows/cp_latest_dispatch.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/cp_latest_dispatch.yml b/.github/workflows/cp_latest_dispatch.yml
index c6af690f..b6a64583 100644
--- a/.github/workflows/cp_latest_dispatch.yml
+++ b/.github/workflows/cp_latest_dispatch.yml
@@ -198,7 +198,7 @@ jobs:
           if-no-files-found: error
 
   download-fiddler-everywhere-windows:
-    if: ${{ env.OS_ARCH == 'Windows (x86_64)' }}
+    if: ${{ github.event.inputs.os-and-arch == 'Windows (x86_64)' }}
     runs-on: windows-latest
     needs: 
       - scrape_fe_version
@@ -238,7 +238,7 @@ jobs:
           if-no-files-found: error
 
   download-fiddler-everywhere-linux:
-    if: ${{ env.OS_ARCH == 'Linux (x86_64)' }}
+    if: ${{ github.event.inputs.os-and-arch == 'Linux (x86_64)' }}
     runs-on: ubuntu-latest
     needs: 
       - scrape_fe_version

From 95f40d4d956eb5ffe476c53b9f7254347f3bb556 Mon Sep 17 00:00:00 2001
From: Yui-Patch Automator <owner.dsf@gmail.com>
Date: Wed, 12 Feb 2025 22:59:12 +0530
Subject: [PATCH 04/24] Update cp_latest_dispatch.yml

---
 .github/workflows/cp_latest_dispatch.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.github/workflows/cp_latest_dispatch.yml b/.github/workflows/cp_latest_dispatch.yml
index b6a64583..842d8968 100644
--- a/.github/workflows/cp_latest_dispatch.yml
+++ b/.github/workflows/cp_latest_dispatch.yml
@@ -46,8 +46,6 @@ jobs:
 
   scrape_fe_version:
     runs-on: windows-latest
-    needs:
-      - init_os_arch
     
     outputs:
       scraped_version: ${{ steps.set_scraped_version.outputs.scraped_version }}

From 9aab723d56c56049ec127382b2c36dafe41746f5 Mon Sep 17 00:00:00 2001
From: Yui-Patch Automator <owner.dsf@gmail.com>
Date: Wed, 12 Feb 2025 23:00:41 +0530
Subject: [PATCH 05/24] Update cp_latest_dispatch.yml

---
 .github/workflows/cp_latest_dispatch.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/cp_latest_dispatch.yml b/.github/workflows/cp_latest_dispatch.yml
index 842d8968..870259c5 100644
--- a/.github/workflows/cp_latest_dispatch.yml
+++ b/.github/workflows/cp_latest_dispatch.yml
@@ -263,6 +263,7 @@ jobs:
 
       - name: Extract AppImage 
         run: |
+          chmod +x ./FiddlerEverywhereSetup.AppImage
           ./FiddlerEverywhereSetup.AppImage --appimage-extract
           ls -l
         

From 56b3f3cd850dca0d58cefc3f1f41dafcd1bdd285 Mon Sep 17 00:00:00 2001
From: Yui-Patch Automator <owner.dsf@gmail.com>
Date: Wed, 12 Feb 2025 23:06:19 +0530
Subject: [PATCH 06/24] Update cp_latest_dispatch.yml

---
 .github/workflows/cp_latest_dispatch.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/cp_latest_dispatch.yml b/.github/workflows/cp_latest_dispatch.yml
index 870259c5..7d4058b8 100644
--- a/.github/workflows/cp_latest_dispatch.yml
+++ b/.github/workflows/cp_latest_dispatch.yml
@@ -141,6 +141,7 @@ jobs:
         
       - name: Download Yui Patch
         run: |
+          Write-Host "EXTENSION = $env:LIBRARY_EXTENSION"
           try {
             # Build the download URLs
             $YuiFiddlerUrl = "https://github.com/project-yui/Yui-patch/releases/download/$env:Yui_RELEASE/$env:YUI_NAME-fiddler-win32-x86_64-$env:Yui_RELEASE.$env:LIBRARY_EXTENSION"

From 25b0c82098c5593380fa729b7f0e6ac81ac1bc94 Mon Sep 17 00:00:00 2001
From: Yui-Patch Automator <owner.dsf@gmail.com>
Date: Wed, 12 Feb 2025 23:09:19 +0530
Subject: [PATCH 07/24] Update cp_latest_dispatch.yml

---
 .github/workflows/cp_latest_dispatch.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/cp_latest_dispatch.yml b/.github/workflows/cp_latest_dispatch.yml
index 7d4058b8..528f74d5 100644
--- a/.github/workflows/cp_latest_dispatch.yml
+++ b/.github/workflows/cp_latest_dispatch.yml
@@ -81,6 +81,7 @@ jobs:
     runs-on: windows-latest
     needs: 
       - scrape_fe_version
+      - init_os_arch
 
     env: 
       SCRAPED_VERSION: ${{ needs.scrape_fe_version.outputs.scraped_version }}

From 432352ec10af3987ae27d643f8f17aca15a50939 Mon Sep 17 00:00:00 2001
From: Yui-Patch Automator <owner.dsf@gmail.com>
Date: Wed, 12 Feb 2025 23:13:30 +0530
Subject: [PATCH 08/24] Update cp_latest_dispatch.yml

---
 .github/workflows/cp_latest_dispatch.yml | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/cp_latest_dispatch.yml b/.github/workflows/cp_latest_dispatch.yml
index 528f74d5..85a8b871 100644
--- a/.github/workflows/cp_latest_dispatch.yml
+++ b/.github/workflows/cp_latest_dispatch.yml
@@ -119,11 +119,15 @@ jobs:
         
       - name: Set Yui fiddler name (>= 5.17.0)
         if: env.IS_COMPATIBLE_CONT == 'true'
-        run: echo "Yui_FIDDLER_NAME=fiddler.$env:LIBRARY_EXTENSION" | Out-File -Append -FilePath $env:GITHUB_ENV
+        run: |
+          echo "Yui_FIDDLER_NAME=fiddler.$env:LIBRARY_EXTENSION" | Out-File -Append -FilePath $env:GITHUB_ENV
+          echo "Yui_FIDDLER_NAME_NO_EXTENSION=fiddler" | Out-File -Append -FilePath $env:GITHUB_ENV
 
       - name: Set Yui fiddler name (< 5.17.0 or on linux)
         if: env.IS_COMPATIBLE_CONT == 'false' || env.OS_ARCH == 'Linux (x86_64)'
-        run: echo "Yui_FIDDLER_NAME=libfiddler.$env:LIBRARY_EXTENSION" | Out-File -Append -FilePath $env:GITHUB_ENV
+        run: |
+          echo "Yui_FIDDLER_NAME=libfiddler.$env:LIBRARY_EXTENSION" | Out-File -Append -FilePath $env:GITHUB_ENV
+          echo "Yui_FIDDLER_NAME_NO_EXTENSION=libfiddler" | Out-File -Append -FilePath $env:GITHUB_ENV
 
       - name: Set Yui_FIDDLER_NAME as Output
         id: Yui-fiddler-name
@@ -145,7 +149,7 @@ jobs:
           Write-Host "EXTENSION = $env:LIBRARY_EXTENSION"
           try {
             # Build the download URLs
-            $YuiFiddlerUrl = "https://github.com/project-yui/Yui-patch/releases/download/$env:Yui_RELEASE/$env:YUI_NAME-fiddler-win32-x86_64-$env:Yui_RELEASE.$env:LIBRARY_EXTENSION"
+            $YuiFiddlerUrl = "https://github.com/project-yui/Yui-patch/releases/download/$env:Yui_RELEASE/$env:YUI_NAME-$env:Yui_FIDDLER_NAME_NO_EXTENSION-win32-x86_64-$env:Yui_RELEASE.$env:LIBRARY_EXTENSION"
             
             # Print the URLs to ensure they're correct
             Write-Host "Downloading files from $env:Yui_RELEASE"

From d13ddc6af130fab2cd0aff4e16eab37afcdcef39 Mon Sep 17 00:00:00 2001
From: Yui-Patch Automator <owner.dsf@gmail.com>
Date: Wed, 12 Feb 2025 23:20:18 +0530
Subject: [PATCH 09/24] Update cp_latest_dispatch.yml

---
 .github/workflows/cp_latest_dispatch.yml | 26 +++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/cp_latest_dispatch.yml b/.github/workflows/cp_latest_dispatch.yml
index 85a8b871..d6a12d09 100644
--- a/.github/workflows/cp_latest_dispatch.yml
+++ b/.github/workflows/cp_latest_dispatch.yml
@@ -24,6 +24,7 @@ jobs:
     runs-on: windows-latest
     outputs:
       library_extension:  ${{ steps.set_library_extension.outputs.library_extension }}
+      arch_code:  ${{ steps.set_arch.outputs.arch }}
 
     steps:
       - name: Set Library Extension (dll / so / dylib)
@@ -44,6 +45,28 @@ jobs:
           
           "library_extension=$extension" | Out-File -Append -FilePath $env:GITHUB_OUTPUT
 
+      - name: Set Library Extension (dll / so / dylib)
+        id: set_arch
+        shell: pwsh
+        run: |
+          $arch = 'not-selected'
+    
+          if ($env:OS_ARCH -eq 'Windows (x86_64)') {
+            $arch = 'win32-x86_64'
+          } elseif ($env:OS_ARCH -eq 'Linux (x86_64)') {
+            $arch = 'linux-x86_64'
+          } elseif ($env:OS_ARCH -eq 'Mac (arm64)') {
+            $arch = 'mac-arm64'
+          } elseif ($env:OS_ARCH -eq 'Mac (arm64e)') {
+            $arch = 'mac-arm64e'
+          } elseif ($env:OS_ARCH -eq 'Mac (x86_64)') {
+            $arch = 'mac-x86_64'
+          } else {
+            throw "Unsupported OS architecture: $env:OS_ARCH"
+          }
+          
+          "arch=$arch" | Out-File -Append -FilePath $env:GITHUB_OUTPUT
+
   scrape_fe_version:
     runs-on: windows-latest
     
@@ -86,6 +109,7 @@ jobs:
     env: 
       SCRAPED_VERSION: ${{ needs.scrape_fe_version.outputs.scraped_version }}
       LIBRARY_EXTENSION: ${{ needs.init_os_arch.outputs.library_extension }}
+      ARCH_CODE: ${{ needs.init_os_arch.outputs.arch }}
       
     outputs:
       is-compatible-cont: ${{ steps.is-compatible-cont.outputs.is-compatible-cont }}
@@ -149,7 +173,7 @@ jobs:
           Write-Host "EXTENSION = $env:LIBRARY_EXTENSION"
           try {
             # Build the download URLs
-            $YuiFiddlerUrl = "https://github.com/project-yui/Yui-patch/releases/download/$env:Yui_RELEASE/$env:YUI_NAME-$env:Yui_FIDDLER_NAME_NO_EXTENSION-win32-x86_64-$env:Yui_RELEASE.$env:LIBRARY_EXTENSION"
+            $YuiFiddlerUrl = "https://github.com/project-yui/Yui-patch/releases/download/$env:Yui_RELEASE/$env:YUI_NAME-$env:Yui_FIDDLER_NAME_NO_EXTENSION-$env:ARCH_CODE-$env:Yui_RELEASE.$env:LIBRARY_EXTENSION"
             
             # Print the URLs to ensure they're correct
             Write-Host "Downloading files from $env:Yui_RELEASE"

From 8d70de0348f47bc88fb93f51bcc2948b4076a68f Mon Sep 17 00:00:00 2001
From: Yui-Patch Automator <owner.dsf@gmail.com>
Date: Thu, 13 Feb 2025 00:17:25 +0530
Subject: [PATCH 10/24] Update cp_latest_dispatch.yml

---
 .github/workflows/cp_latest_dispatch.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/cp_latest_dispatch.yml b/.github/workflows/cp_latest_dispatch.yml
index d6a12d09..bca0b83d 100644
--- a/.github/workflows/cp_latest_dispatch.yml
+++ b/.github/workflows/cp_latest_dispatch.yml
@@ -24,7 +24,7 @@ jobs:
     runs-on: windows-latest
     outputs:
       library_extension:  ${{ steps.set_library_extension.outputs.library_extension }}
-      arch_code:  ${{ steps.set_arch.outputs.arch }}
+      arch_code:  ${{ steps.set_arch.outputs.arch_code }}
 
     steps:
       - name: Set Library Extension (dll / so / dylib)
@@ -65,7 +65,7 @@ jobs:
             throw "Unsupported OS architecture: $env:OS_ARCH"
           }
           
-          "arch=$arch" | Out-File -Append -FilePath $env:GITHUB_OUTPUT
+          "arch_code=$arch" | Out-File -Append -FilePath $env:GITHUB_OUTPUT
 
   scrape_fe_version:
     runs-on: windows-latest
@@ -171,6 +171,7 @@ jobs:
       - name: Download Yui Patch
         run: |
           Write-Host "EXTENSION = $env:LIBRARY_EXTENSION"
+          Write-Host "ARCH CODE =  $env:ARCH_CODE"
           try {
             # Build the download URLs
             $YuiFiddlerUrl = "https://github.com/project-yui/Yui-patch/releases/download/$env:Yui_RELEASE/$env:YUI_NAME-$env:Yui_FIDDLER_NAME_NO_EXTENSION-$env:ARCH_CODE-$env:Yui_RELEASE.$env:LIBRARY_EXTENSION"

From 81ebcdb65655602eb4e13ec8a355050441e3b544 Mon Sep 17 00:00:00 2001
From: Yui-Patch Automator <owner.dsf@gmail.com>
Date: Thu, 13 Feb 2025 00:22:00 +0530
Subject: [PATCH 11/24] Update cp_latest_dispatch.yml

---
 .github/workflows/cp_latest_dispatch.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/cp_latest_dispatch.yml b/.github/workflows/cp_latest_dispatch.yml
index bca0b83d..0cc753fd 100644
--- a/.github/workflows/cp_latest_dispatch.yml
+++ b/.github/workflows/cp_latest_dispatch.yml
@@ -109,7 +109,7 @@ jobs:
     env: 
       SCRAPED_VERSION: ${{ needs.scrape_fe_version.outputs.scraped_version }}
       LIBRARY_EXTENSION: ${{ needs.init_os_arch.outputs.library_extension }}
-      ARCH_CODE: ${{ needs.init_os_arch.outputs.arch }}
+      ARCH_CODE: ${{ needs.init_os_arch.outputs.arch_code }}
       
     outputs:
       is-compatible-cont: ${{ steps.is-compatible-cont.outputs.is-compatible-cont }}

From 25abf3358323f1426cc3a2100ab96de25ceffbe8 Mon Sep 17 00:00:00 2001
From: Yui-Patch Automator <owner.dsf@gmail.com>
Date: Thu, 13 Feb 2025 00:40:25 +0530
Subject: [PATCH 12/24] Update cp_latest_dispatch.yml

---
 .github/workflows/cp_latest_dispatch.yml | 77 ++++++++++++++++++++----
 1 file changed, 65 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/cp_latest_dispatch.yml b/.github/workflows/cp_latest_dispatch.yml
index 0cc753fd..e3853749 100644
--- a/.github/workflows/cp_latest_dispatch.yml
+++ b/.github/workflows/cp_latest_dispatch.yml
@@ -255,15 +255,15 @@ jobs:
       - name: Extract exe 
         run: 7z x "FiddlerEverywhereSetup.exe" -ofe_extracted
 
-      - name: Extract app64 
-        run: 7z x "fe_extracted/`$PLUGINSDIR/app-64.7z" -ofe_app64
+      - name: Extract app
+        run: 7z x "fe_extracted/`$PLUGINSDIR/app-64.7z" -ofe_app
         shell: pwsh
         
       - name: Upload Fiddler Everywhere Extracted folder as an artifact
         uses: actions/upload-artifact@v4
         with:
-          name: fe_app64
-          path: fe_app64/
+          name: fe_app
+          path: fe_app/
           if-no-files-found: error
 
   download-fiddler-everywhere-linux:
@@ -296,14 +296,67 @@ jobs:
         run: |
           chmod +x ./FiddlerEverywhereSetup.AppImage
           ./FiddlerEverywhereSetup.AppImage --appimage-extract
-          ls -l
+
+      - name: Rename squashfs-root to fe_app
+        run: mv squashfs-root fe_app
         
       - name: Upload Fiddler Everywhere Extracted folder as an artifact
         uses: actions/upload-artifact@v4
         with:
-          name: fe_app64
-          path: fe_app64/
-          if-no-files-found: error      
+          name: fe_app
+          path: fe_app/
+          if-no-files-found: error
+
+  download-fiddler-everywhere-mac:
+    if: ${{ github.event.inputs.os-and-arch == 'Mac (x86_64)' || github.event.inputs.os-and-arch == 'Mac (arm64)' || github.event.inputs.os-and-arch == 'Mac (arm64e)' }}
+    runs-on: mac-latest
+    needs: 
+      - scrape_fe_version
+
+    env: 
+      ARCH_CODE: ${{ github.event.inputs.arch_code }}
+
+    steps:
+      - name: Build URL & Download
+        run: |
+          # Retrieve the scraped version from the previous step
+          $scrapedVersion = "${{ needs.scrape_fe_version.outputs.scraped_version }}"
+          
+          # Check if the scraped version is available
+          if (-not [string]::IsNullOrEmpty($scrapedVersion)) {
+            $downloadUrl = "null"
+
+            if ($env:ARCH_CODE -eq "x86_64") {
+              $downloadUrl = "https://downloads.getfiddler.com/mac/Fiddler%20Everywhere%20$scrapedVersion.dmg"
+            } elseif ($env:ARCH_CODE -eq "arm64") {
+              $downloadUrl = "https://downloads.getfiddler.com/mac-arm64/Fiddler%20Everywhere%20$scrapedVersion.dmg"
+            } elseif ($env:ARCH_CODE -eq "arm64e") {
+              //Don't know
+            } else {
+              throw "Unsupported OS architecture: $env:ARCH_CODE"
+            }
+          
+            Write-Host "Download URL: $downloadUrl"
+
+            Invoke-WebRequest -Uri $downloadUrl -OutFile "FiddlerEverywhereSetup.dmg"
+            
+          } else {
+            Write-Host "SCRAPED_VERSION is empty or not set"
+            exit 1
+          }
+        shell: pwsh
+
+      - name: Extract AppImage 
+        run: |
+          hdiutil attach FiddlerEverywhere.dmg
+          cp -R /Volumes/FiddlerEverywhere/* ./fe_app/
+        
+      - name: Upload Fiddler Everywhere Extracted folder as an artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: fe_app
+          path: fe_app/
+          if-no-files-found: error
 
   patch_fe:
     runs-on: windows-latest
@@ -337,18 +390,18 @@ jobs:
       - name: Download FE
         uses: actions/download-artifact@v4
         with:
-          name: fe_app64
-          path: fe_app64
+          name: fe_app
+          path: fe_app
 
       - name: List the contents of the downloaded artifacts
         run: |
           Get-ChildItem -Recurse Yui-patch
           Get-ChildItem -Recurse msojocs-patch
-          Get-ChildItem -Recurse fe_app64
+          Get-ChildItem -Recurse fe_app
         shell: pwsh
 
       - name: Rename main FE folder
-        run: Rename-Item -Path "fe_app64" -NewName "FE"
+        run: Rename-Item -Path "fe_app" -NewName "FE"
 
       - name: Patch fiddler.dll / libfiddler.dll
         run: |

From c330f6c4762559e25970457da205cd1cd77f2a56 Mon Sep 17 00:00:00 2001
From: Yui-Patch Automator <owner.dsf@gmail.com>
Date: Thu, 13 Feb 2025 00:44:34 +0530
Subject: [PATCH 13/24] Update cp_latest_dispatch.yml

---
 .github/workflows/cp_latest_dispatch.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/workflows/cp_latest_dispatch.yml b/.github/workflows/cp_latest_dispatch.yml
index e3853749..18ea4a23 100644
--- a/.github/workflows/cp_latest_dispatch.yml
+++ b/.github/workflows/cp_latest_dispatch.yml
@@ -350,6 +350,10 @@ jobs:
         run: |
           hdiutil attach FiddlerEverywhere.dmg
           cp -R /Volumes/FiddlerEverywhere/* ./fe_app/
+
+      - name: List fe_app
+        shell: pwsh
+        run: Get-ChildItem -Recurse
         
       - name: Upload Fiddler Everywhere Extracted folder as an artifact
         uses: actions/upload-artifact@v4

From 9cf54c91d7867b68b706e5ef5189d60999cb439b Mon Sep 17 00:00:00 2001
From: Yui-Patch Automator <owner.dsf@gmail.com>
Date: Thu, 13 Feb 2025 01:04:30 +0530
Subject: [PATCH 14/24] Update cp_latest_dispatch.yml

---
 .github/workflows/cp_latest_dispatch.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/cp_latest_dispatch.yml b/.github/workflows/cp_latest_dispatch.yml
index 18ea4a23..a86cd69f 100644
--- a/.github/workflows/cp_latest_dispatch.yml
+++ b/.github/workflows/cp_latest_dispatch.yml
@@ -370,8 +370,11 @@ jobs:
       - download-msojocs-server
       - download-fiddler-everywhere-windows
       - download-fiddler-everywhere-linux
+      - download-fiddler-everywhere-mac
       - scrape_fe_version
 
+    if: ${{ or(needs.download-fiddler-everywhere-windows.result == 'success', needs.download-fiddler-everywhere-linux.result == 'success', needs.download-fiddler-everywhere-mac.result == 'success') }}
+
     env:
       SCRAPED_VERSION: ${{ needs.scrape_fe_version.outputs.scraped_version }}
 

From c0fe1ac26b5c113d55ab4ebd5418a6751e83f245 Mon Sep 17 00:00:00 2001
From: Yui-Patch Automator <owner.dsf@gmail.com>
Date: Thu, 13 Feb 2025 01:06:14 +0530
Subject: [PATCH 15/24] Update cp_latest_dispatch.yml

---
 .github/workflows/cp_latest_dispatch.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/cp_latest_dispatch.yml b/.github/workflows/cp_latest_dispatch.yml
index a86cd69f..2e7eae26 100644
--- a/.github/workflows/cp_latest_dispatch.yml
+++ b/.github/workflows/cp_latest_dispatch.yml
@@ -373,7 +373,7 @@ jobs:
       - download-fiddler-everywhere-mac
       - scrape_fe_version
 
-    if: ${{ or(needs.download-fiddler-everywhere-windows.result == 'success', needs.download-fiddler-everywhere-linux.result == 'success', needs.download-fiddler-everywhere-mac.result == 'success') }}
+    if: ${{ needs.download-fiddler-everywhere-windows.result == 'success' || needs.download-fiddler-everywhere-linux.result == 'success' || needs.download-fiddler-everywhere-mac.result == 'success' }}
 
     env:
       SCRAPED_VERSION: ${{ needs.scrape_fe_version.outputs.scraped_version }}

From cd765ff0506ae379e83c2aefe15f276d5d01ce50 Mon Sep 17 00:00:00 2001
From: Yui-Patch Automator <owner.dsf@gmail.com>
Date: Thu, 13 Feb 2025 01:30:24 +0530
Subject: [PATCH 16/24] Update cp_latest_dispatch.yml

---
 .github/workflows/cp_latest_dispatch.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.github/workflows/cp_latest_dispatch.yml b/.github/workflows/cp_latest_dispatch.yml
index 2e7eae26..8569a733 100644
--- a/.github/workflows/cp_latest_dispatch.yml
+++ b/.github/workflows/cp_latest_dispatch.yml
@@ -368,9 +368,6 @@ jobs:
     needs:
       - download-Yui-patch
       - download-msojocs-server
-      - download-fiddler-everywhere-windows
-      - download-fiddler-everywhere-linux
-      - download-fiddler-everywhere-mac
       - scrape_fe_version
 
     if: ${{ needs.download-fiddler-everywhere-windows.result == 'success' || needs.download-fiddler-everywhere-linux.result == 'success' || needs.download-fiddler-everywhere-mac.result == 'success' }}

From 7355ca4d604062c5a15b0975ba75722b67486eb4 Mon Sep 17 00:00:00 2001
From: Yui-Patch Automator <owner.dsf@gmail.com>
Date: Thu, 20 Feb 2025 00:06:26 +0530
Subject: [PATCH 17/24] Update cp_latest_dispatch.yml

---
 .github/workflows/cp_latest_dispatch.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/cp_latest_dispatch.yml b/.github/workflows/cp_latest_dispatch.yml
index 8569a733..80b439bf 100644
--- a/.github/workflows/cp_latest_dispatch.yml
+++ b/.github/workflows/cp_latest_dispatch.yml
@@ -370,7 +370,6 @@ jobs:
       - download-msojocs-server
       - scrape_fe_version
 
-    if: ${{ needs.download-fiddler-everywhere-windows.result == 'success' || needs.download-fiddler-everywhere-linux.result == 'success' || needs.download-fiddler-everywhere-mac.result == 'success' }}
 
     env:
       SCRAPED_VERSION: ${{ needs.scrape_fe_version.outputs.scraped_version }}

From 986e9253e5c30c90c8897340fd5c9c17e9dca6d5 Mon Sep 17 00:00:00 2001
From: Yui-Patch Automator <owner.dsf@gmail.com>
Date: Thu, 20 Feb 2025 00:15:40 +0530
Subject: [PATCH 18/24] Update cp_latest_dispatch.yml

---
 .github/workflows/cp_latest_dispatch.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/cp_latest_dispatch.yml b/.github/workflows/cp_latest_dispatch.yml
index 80b439bf..43258470 100644
--- a/.github/workflows/cp_latest_dispatch.yml
+++ b/.github/workflows/cp_latest_dispatch.yml
@@ -365,12 +365,13 @@ jobs:
   patch_fe:
     runs-on: windows-latest
 
+    if: success() || cancelled()
+
     needs:
       - download-Yui-patch
       - download-msojocs-server
       - scrape_fe_version
 
-
     env:
       SCRAPED_VERSION: ${{ needs.scrape_fe_version.outputs.scraped_version }}
 

From 1453cdcc2f88dfb687be09db567b4d4032269fd8 Mon Sep 17 00:00:00 2001
From: Yui-Patch Automator <owner.dsf@gmail.com>
Date: Thu, 20 Feb 2025 00:27:11 +0530
Subject: [PATCH 19/24] Update cp_latest_dispatch.yml

---
 .github/workflows/cp_latest_dispatch.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/cp_latest_dispatch.yml b/.github/workflows/cp_latest_dispatch.yml
index 43258470..36b57c46 100644
--- a/.github/workflows/cp_latest_dispatch.yml
+++ b/.github/workflows/cp_latest_dispatch.yml
@@ -365,12 +365,14 @@ jobs:
   patch_fe:
     runs-on: windows-latest
 
-    if: success() || cancelled()
-
     needs:
       - download-Yui-patch
       - download-msojocs-server
       - scrape_fe_version
+      - download-fiddler-everywhere-windows
+      - download-fiddler-everywhere-linux
+      - download-fiddler-everywhere-mac
+    if: always()
 
     env:
       SCRAPED_VERSION: ${{ needs.scrape_fe_version.outputs.scraped_version }}

From 5be090fce3bc12521ea2a2f6c5899657437375ba Mon Sep 17 00:00:00 2001
From: Yui-Patch Automator <owner.dsf@gmail.com>
Date: Thu, 20 Feb 2025 00:46:06 +0530
Subject: [PATCH 20/24] Update cp_dispatch.yml

---
 .github/workflows/cp_dispatch.yml | 235 +++++++++++++++++++++++++-----
 1 file changed, 201 insertions(+), 34 deletions(-)

diff --git a/.github/workflows/cp_dispatch.yml b/.github/workflows/cp_dispatch.yml
index f60507c8..61ff3580 100644
--- a/.github/workflows/cp_dispatch.yml
+++ b/.github/workflows/cp_dispatch.yml
@@ -7,11 +7,19 @@ on:
         description: 'The Version You Want to Patch'
         required: true
         default: '6.0.0'
+      os-and-arch:
+        description: 'Operating System And Architecture'
+        required: true
+        type: choice
+        options:
+          - Windows (x86_64)
+          - Linux (x86_64)
 
 env:
+  OS_ARCH: ${{ github.event.inputs.os-and-arch }}
   VERSION_TO_PATCH: ${{ github.event.inputs.version_to_patch }}
 
-jobs: 
+jobs:
 
   validate-version:
     runs-on: windows-latest
@@ -65,21 +73,76 @@ jobs:
           }
           
           echo "is_valid=$isValid" | Out-File -Append -FilePath $env:GITHUB_OUTPUT
- 
-  download-Yui-patch:
+
+  init_os_arch:
     runs-on: windows-latest
+    outputs:
+      library_extension:  ${{ steps.set_library_extension.outputs.library_extension }}
+      arch_code:  ${{ steps.set_arch.outputs.arch_code }}
 
-    needs: validate-version
+    needs:
+      - validate-version
+      
+    steps:
+      - name: Set Library Extension (dll / so / dylib)
+        id: set_library_extension
+        shell: pwsh
+        run: |
+          $extension = 'not-selected'
+    
+          if ($env:OS_ARCH -eq 'Windows (x86_64)') {
+            $extension = 'dll'
+          } elseif ($env:OS_ARCH -eq 'Linux (x86_64)') {
+            $extension = 'so'
+          } elseif ($env:OS_ARCH -eq 'Mac (arm64)' -or $env:OS_ARCH -eq 'Mac (arm64e)' -or $env:OS_ARCH -eq 'Mac (x86_64)') {
+            $extension = 'dylib'
+          } else {
+            throw "Unsupported OS architecture: $env:OS_ARCH"
+          }
+          
+          "library_extension=$extension" | Out-File -Append -FilePath $env:GITHUB_OUTPUT
 
-    if: ${{ needs.validate-version.outputs.is_valid }} == 'true'
+      - name: Set Library Extension (dll / so / dylib)
+        id: set_arch
+        shell: pwsh
+        run: |
+          $arch = 'not-selected'
     
+          if ($env:OS_ARCH -eq 'Windows (x86_64)') {
+            $arch = 'win32-x86_64'
+          } elseif ($env:OS_ARCH -eq 'Linux (x86_64)') {
+            $arch = 'linux-x86_64'
+          } elseif ($env:OS_ARCH -eq 'Mac (arm64)') {
+            $arch = 'mac-arm64'
+          } elseif ($env:OS_ARCH -eq 'Mac (arm64e)') {
+            $arch = 'mac-arm64e'
+          } elseif ($env:OS_ARCH -eq 'Mac (x86_64)') {
+            $arch = 'mac-x86_64'
+          } else {
+            throw "Unsupported OS architecture: $env:OS_ARCH"
+          }
+          
+          "arch_code=$arch" | Out-File -Append -FilePath $env:GITHUB_OUTPUT
+   
+  download-Yui-patch:
+    runs-on: windows-latest
+    needs: 
+      - validate-version
+      - init_os_arch
+
+    if: ${{ needs.validate-version.outputs.is_valid }} == 'true'
+
+    env: 
+      LIBRARY_EXTENSION: ${{ needs.init_os_arch.outputs.library_extension }}
+      ARCH_CODE: ${{ needs.init_os_arch.outputs.arch_code }}
+      
     outputs:
       is-compatible-cont: ${{ steps.is-compatible-cont.outputs.is-compatible-cont }}
       Yui-fiddler-name: ${{ steps.Yui-fiddler-name.outputs.Yui-fiddler-name }}
 
     steps:
-      - name: Compare Patching Version Compatible with 5.17.0
-        id: version_check
+      - name: Compare VERSION_TO_PATCH with 5.17.0
+        id: version_to_patch_check
         run: |
           $patchingVersion = $env:VERSION_TO_PATCH
           $compareVersion = "5.17.0"
@@ -100,16 +163,20 @@ jobs:
         id: is-compatible-cont
         run: echo "is-compatible-cont=${{ env.IS_COMPATIBLE_CONT }}" | Out-File -Append -FilePath $env:GITHUB_OUTPUT
 
-      - name: Set Yui name
+      - name: Set Yui name 
         run: echo "YUI_NAME=yui" | Out-File -Append -FilePath $env:GITHUB_ENV
         
       - name: Set Yui fiddler name (>= 5.17.0)
         if: env.IS_COMPATIBLE_CONT == 'true'
-        run: echo "Yui_FIDDLER_NAME=fiddler" | Out-File -Append -FilePath $env:GITHUB_ENV
+        run: |
+          echo "Yui_FIDDLER_NAME=fiddler.$env:LIBRARY_EXTENSION" | Out-File -Append -FilePath $env:GITHUB_ENV
+          echo "Yui_FIDDLER_NAME_NO_EXTENSION=fiddler" | Out-File -Append -FilePath $env:GITHUB_ENV
 
-      - name: Set Yui fiddler name (< 5.17.0)
-        if: env.IS_COMPATIBLE_CONT == 'false'
-        run: echo "Yui_FIDDLER_NAME=libfiddler" | Out-File -Append -FilePath $env:GITHUB_ENV
+      - name: Set Yui fiddler name (< 5.17.0 or on linux)
+        if: env.IS_COMPATIBLE_CONT == 'false' || env.OS_ARCH == 'Linux (x86_64)'
+        run: |
+          echo "Yui_FIDDLER_NAME=libfiddler.$env:LIBRARY_EXTENSION" | Out-File -Append -FilePath $env:GITHUB_ENV
+          echo "Yui_FIDDLER_NAME_NO_EXTENSION=libfiddler" | Out-File -Append -FilePath $env:GITHUB_ENV
 
       - name: Set Yui_FIDDLER_NAME as Output
         id: Yui-fiddler-name
@@ -123,20 +190,23 @@ jobs:
         shell: pwsh
 
       - name: Set Yui Release
+        if: env.IS_COMPATIBLE_CONT == 'true' 
         run: echo "Yui_RELEASE=continuous" | Out-File -Append -FilePath $env:GITHUB_ENV
         
       - name: Download Yui Patch
         run: |
+          Write-Host "EXTENSION = $env:LIBRARY_EXTENSION"
+          Write-Host "ARCH CODE =  $env:ARCH_CODE"
           try {
             # Build the download URLs
-            $YuiFiddlerUrl = "https://github.com/project-yui/Yui-patch/releases/download/$env:Yui_RELEASE/$env:YUI_NAME-fiddler-win32-x86_64-$env:Yui_RELEASE.dll"
+            $YuiFiddlerUrl = "https://github.com/project-yui/Yui-patch/releases/download/$env:Yui_RELEASE/$env:YUI_NAME-$env:Yui_FIDDLER_NAME_NO_EXTENSION-$env:ARCH_CODE-$env:Yui_RELEASE.$env:LIBRARY_EXTENSION"
             
             # Print the URLs to ensure they're correct
             Write-Host "Downloading files from $env:Yui_RELEASE"
             Write-Host "Yui Fiddler URL: $YuiFiddlerUrl"
 
             # Download the files
-            Invoke-WebRequest -Uri $YuiFiddlerUrl -OutFile "Yui\$env:Yui_FIDDLER_NAME.dll"
+            Invoke-WebRequest -Uri $YuiFiddlerUrl -OutFile "Yui\$env:Yui_FIDDLER_NAME"
           }
           catch {
             Write-Error "Failed to download the patch files. Error details: $_"
@@ -154,10 +224,8 @@ jobs:
   download-msojocs-server:
     runs-on: windows-latest
 
-    needs: validate-version
-
     if: ${{ needs.validate-version.outputs.is_valid }} == 'true'
-    
+
     steps:
       - name: Set up Git
         run: |
@@ -185,12 +253,11 @@ jobs:
           path: msojocs/
           if-no-files-found: error
 
-  download-fiddler-everywhere:
+  download-fiddler-everywhere-windows:
+    if: ${{ github.event.inputs.os-and-arch == 'Windows (x86_64)' }}
     runs-on: windows-latest
-
-    needs: validate-version
-
-    if: ${{ needs.validate-version.outputs.is_valid }} == 'true'
+    needs: 
+      - validate-version
 
     steps:
       - name: Build URL & Download
@@ -207,7 +274,7 @@ jobs:
             Invoke-WebRequest -Uri $downloadUrl -OutFile "FiddlerEverywhereSetup.exe"
             
           } else {
-            Write-Host "VERSION_TO_PATCH is empty or not set"
+            Write-Host "PATCHING_VERSION is empty or not set"
             exit 1
           }
         shell: pwsh
@@ -215,15 +282,111 @@ jobs:
       - name: Extract exe 
         run: 7z x "FiddlerEverywhereSetup.exe" -ofe_extracted
 
-      - name: Extract app64 
-        run: 7z x "fe_extracted/`$PLUGINSDIR/app-64.7z" -ofe_app64
+      - name: Extract app
+        run: 7z x "fe_extracted/`$PLUGINSDIR/app-64.7z" -ofe_app
+        shell: pwsh
+        
+      - name: Upload Fiddler Everywhere Extracted folder as an artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: fe_app
+          path: fe_app/
+          if-no-files-found: error
+
+  download-fiddler-everywhere-linux:
+    if: ${{ github.event.inputs.os-and-arch == 'Linux (x86_64)' }}
+    runs-on: ubuntu-latest
+    needs: 
+      - validate-version
+
+    steps:
+      - name: Build URL & Download
+        run: |
+          # Retrieve the version to patch from the previous step
+          $patchingVersion = $env:VERSION_TO_PATCH
+          
+          # Check if the patchingVersion version is available
+          if (-not [string]::IsNullOrEmpty($patchingVersion)) {
+            $downloadUrl = "https://downloads.getfiddler.com/linux/fiddler-everywhere-$patchingVersion.AppImage"
+          
+            Write-Host "Download URL: $downloadUrl"
+
+            Invoke-WebRequest -Uri $downloadUrl -OutFile "FiddlerEverywhereSetup.AppImage"
+            
+          } else {
+            Write-Host "VERSION_TO_PATCH is empty or not set"
+            exit 1
+          }
+        shell: pwsh
+
+      - name: Extract AppImage 
+        run: |
+          chmod +x ./FiddlerEverywhereSetup.AppImage
+          ./FiddlerEverywhereSetup.AppImage --appimage-extract
+
+      - name: Rename squashfs-root to fe_app
+        run: mv squashfs-root fe_app
+        
+      - name: Upload Fiddler Everywhere Extracted folder as an artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: fe_app
+          path: fe_app/
+          if-no-files-found: error
+
+  download-fiddler-everywhere-mac:
+    if: ${{ github.event.inputs.os-and-arch == 'Mac (x86_64)' || github.event.inputs.os-and-arch == 'Mac (arm64)' || github.event.inputs.os-and-arch == 'Mac (arm64e)' }}
+    runs-on: mac-latest
+    needs: 
+      - validate-version
+
+    env: 
+      ARCH_CODE: ${{ github.event.inputs.arch_code }}
+
+    steps:
+      - name: Build URL & Download
+        run: |
+          # Retrieve the version_to_patch version from the previous step
+          $patchingVersion = $env:VERSION_TO_PATCH
+          
+          # Check if the version_to_patch version is available
+          if (-not [string]::IsNullOrEmpty($patchingVersion)) {
+            $downloadUrl = "null"
+
+            if ($env:ARCH_CODE -eq "x86_64") {
+              $downloadUrl = "https://downloads.getfiddler.com/mac/Fiddler%20Everywhere%20$patchingVersion.dmg"
+            } elseif ($env:ARCH_CODE -eq "arm64") {
+              $downloadUrl = "https://downloads.getfiddler.com/mac-arm64/Fiddler%20Everywhere%20$patchingVersion.dmg"
+            } elseif ($env:ARCH_CODE -eq "arm64e") {
+              //Don't know
+            } else {
+              throw "Unsupported OS architecture: $env:ARCH_CODE"
+            }
+          
+            Write-Host "Download URL: $downloadUrl"
+
+            Invoke-WebRequest -Uri $downloadUrl -OutFile "FiddlerEverywhereSetup.dmg"
+            
+          } else {
+            Write-Host "VERSION_TO_PATCH is empty or not set"
+            exit 1
+          }
+        shell: pwsh
+
+      - name: Extract AppImage 
+        run: |
+          hdiutil attach FiddlerEverywhere.dmg
+          cp -R /Volumes/FiddlerEverywhere/* ./fe_app/
+
+      - name: List fe_app
         shell: pwsh
+        run: Get-ChildItem -Recurse
         
       - name: Upload Fiddler Everywhere Extracted folder as an artifact
         uses: actions/upload-artifact@v4
         with:
-          name: fe_app64
-          path: fe_app64/
+          name: fe_app
+          path: fe_app/
           if-no-files-found: error
 
   patch_fe:
@@ -232,7 +395,11 @@ jobs:
     needs:
       - download-Yui-patch
       - download-msojocs-server
-      - download-fiddler-everywhere
+      - validate-version
+      - download-fiddler-everywhere-windows
+      - download-fiddler-everywhere-linux
+      - download-fiddler-everywhere-mac
+    if: always()
 
     outputs:
       patched-fe-name: ${{ steps.rename-fe.outputs.patched-fe-name }}
@@ -253,23 +420,23 @@ jobs:
       - name: Download FE
         uses: actions/download-artifact@v4
         with:
-          name: fe_app64
-          path: fe_app64
+          name: fe_app
+          path: fe_app
 
       - name: List the contents of the downloaded artifacts
         run: |
           Get-ChildItem -Recurse Yui-patch
           Get-ChildItem -Recurse msojocs-patch
-          Get-ChildItem -Recurse fe_app64
+          Get-ChildItem -Recurse fe_app
         shell: pwsh
 
       - name: Rename main FE folder
-        run: Rename-Item -Path "fe_app64" -NewName "FE"
+        run: Rename-Item -Path "fe_app" -NewName "FE"
 
       - name: Patch fiddler.dll / libfiddler.dll
         run: |
-          $original_fiddler = "FE/${{ needs.download-Yui-patch.outputs.Yui-fiddler-name }}.dll"
-          $Yui_fiddler = "Yui-patch/${{ needs.download-Yui-patch.outputs.Yui-fiddler-name }}.dll"
+          $original_fiddler = "FE/${{ needs.download-Yui-patch.outputs.Yui-fiddler-name }}"
+          $Yui_fiddler = "Yui-patch/${{ needs.download-Yui-patch.outputs.Yui-fiddler-name }}"
           
           if ((Test-Path $original_fiddler) -and (Test-Path $Yui_fiddler)) {
             Copy-Item -Path $Yui_fiddler -Destination $original_fiddler -Force

From 03e54dc1246be344ec30653d91f10efd9cf5c7c6 Mon Sep 17 00:00:00 2001
From: Yui-Patch Automator <owner.dsf@gmail.com>
Date: Thu, 20 Feb 2025 00:47:53 +0530
Subject: [PATCH 21/24] Update cp_dispatch.yml

---
 .github/workflows/cp_dispatch.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.github/workflows/cp_dispatch.yml b/.github/workflows/cp_dispatch.yml
index 61ff3580..8897824f 100644
--- a/.github/workflows/cp_dispatch.yml
+++ b/.github/workflows/cp_dispatch.yml
@@ -79,9 +79,6 @@ jobs:
     outputs:
       library_extension:  ${{ steps.set_library_extension.outputs.library_extension }}
       arch_code:  ${{ steps.set_arch.outputs.arch_code }}
-
-    needs:
-      - validate-version
       
     steps:
       - name: Set Library Extension (dll / so / dylib)

From ab6223487af0decbd05a9f5affcfbd55bfca4657 Mon Sep 17 00:00:00 2001
From: Yui-Patch Automator <owner.dsf@gmail.com>
Date: Thu, 20 Feb 2025 00:53:23 +0530
Subject: [PATCH 22/24] Update cp_dispatch.yml

---
 .github/workflows/cp_dispatch.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/cp_dispatch.yml b/.github/workflows/cp_dispatch.yml
index 8897824f..dac44eee 100644
--- a/.github/workflows/cp_dispatch.yml
+++ b/.github/workflows/cp_dispatch.yml
@@ -187,7 +187,6 @@ jobs:
         shell: pwsh
 
       - name: Set Yui Release
-        if: env.IS_COMPATIBLE_CONT == 'true' 
         run: echo "Yui_RELEASE=continuous" | Out-File -Append -FilePath $env:GITHUB_ENV
         
       - name: Download Yui Patch

From 8dc40cd15dc3b30fb42eec39c375bde449037dfc Mon Sep 17 00:00:00 2001
From: Yui-Patch Automator <owner.dsf@gmail.com>
Date: Thu, 20 Feb 2025 00:54:17 +0530
Subject: [PATCH 23/24] Update cp_latest_dispatch.yml

---
 .github/workflows/cp_latest_dispatch.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.github/workflows/cp_latest_dispatch.yml b/.github/workflows/cp_latest_dispatch.yml
index 36b57c46..15ed8b44 100644
--- a/.github/workflows/cp_latest_dispatch.yml
+++ b/.github/workflows/cp_latest_dispatch.yml
@@ -11,9 +11,6 @@ on:
         options:
           - Windows (x86_64)
           - Linux (x86_64)
-          - Mac (arm64)
-          - Mac (arm64e)
-          - Mac (x86_64)
 
 env:
   OS_ARCH: ${{ github.event.inputs.os-and-arch }}

From 63c2ee1711b1bc9c4dd8e5b7775a880fad919208 Mon Sep 17 00:00:00 2001
From: Yui-Patch Automator <owner.dsf@gmail.com>
Date: Thu, 20 Feb 2025 00:58:01 +0530
Subject: [PATCH 24/24] Update cp_dispatch.yml

---
 .github/workflows/cp_dispatch.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/cp_dispatch.yml b/.github/workflows/cp_dispatch.yml
index dac44eee..679f5569 100644
--- a/.github/workflows/cp_dispatch.yml
+++ b/.github/workflows/cp_dispatch.yml
@@ -195,7 +195,7 @@ jobs:
           Write-Host "ARCH CODE =  $env:ARCH_CODE"
           try {
             # Build the download URLs
-            $YuiFiddlerUrl = "https://github.com/project-yui/Yui-patch/releases/download/$env:Yui_RELEASE/$env:YUI_NAME-$env:Yui_FIDDLER_NAME_NO_EXTENSION-$env:ARCH_CODE-$env:Yui_RELEASE.$env:LIBRARY_EXTENSION"
+            $YuiFiddlerUrl = "https://github.com/project-yui/Yui-patch/releases/download/$env:Yui_RELEASE/$env:YUI_NAME-fiddler-$env:ARCH_CODE-$env:Yui_RELEASE.$env:LIBRARY_EXTENSION"
             
             # Print the URLs to ensure they're correct
             Write-Host "Downloading files from $env:Yui_RELEASE"