From 10e8c866f20c0f5ea0b5998326997b35ac64364b Mon Sep 17 00:00:00 2001
From: David Colburn <xero73@gmail.com>
Date: Thu, 20 Jun 2024 12:12:59 -0700
Subject: [PATCH] final fixes

---
 .github/workflows/publish-chrome.yaml | 7 +++++--
 build/chrome/Dockerfile               | 1 -
 build/chrome/install-chrome           | 8 ++++----
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/publish-chrome.yaml b/.github/workflows/publish-chrome.yaml
index cb6f8822..b334498e 100644
--- a/.github/workflows/publish-chrome.yaml
+++ b/.github/workflows/publish-chrome.yaml
@@ -111,17 +111,20 @@ jobs:
               -t chrome@${{ steps.get_builder.outputs.builder_ip }} \
               'bash -s ${{ inputs.chrome_version }}' < ./build/chrome/scripts/driver.sh
 
-      - name: Download artifacts
+      - name: Prepare artifacts
         run: |
           ssh -i ~/.ssh/linode_ed25519 \
               -o PasswordAuthentication=no \
               -t chrome@${{ steps.get_builder.outputs.builder_ip }} \
               'zip -r output.zip ./output'
+
+      - name: Download artifacts
+        run: |
           scp -i ~/.ssh/linode_ed25519 \
               -o PasswordAuthentication=no \
               chrome@${{ steps.get_builder.outputs.builder_ip }}:/home/chrome/output.zip \
               ${{ github.workspace }}/build/chrome/output.zip
-          unzip ${{ github.workspace }}/build/chrome/output.zip -d ${{ github.workspace }}/build/chrome/output
+          unzip ${{ github.workspace }}/build/chrome/output.zip -d ${{ github.workspace }}/build/chrome
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
diff --git a/build/chrome/Dockerfile b/build/chrome/Dockerfile
index 8697057b..df9a5507 100644
--- a/build/chrome/Dockerfile
+++ b/build/chrome/Dockerfile
@@ -17,5 +17,4 @@ FROM ubuntu:22.04
 RUN mkdir /chrome-installer
 COPY output/arm64 /chrome-installer/arm64
 COPY output/amd64 /chrome-installer/amd64
-COPY output/chromedriver /chrome-installer/chromedriver
 COPY install-chrome /chrome-installer/install-chrome
diff --git a/build/chrome/install-chrome b/build/chrome/install-chrome
index d6db05e9..2a19ec49 100755
--- a/build/chrome/install-chrome
+++ b/build/chrome/install-chrome
@@ -36,16 +36,16 @@ then
     libxrender1 \
     libxss1 \
     libxtst6
-  chmod +x /chrome-installer/arm64/chromedriver
-  mv -f /chrome-installer/arm64/chromedriver /usr/local/bin/chromedriver
+  chmod +x /chrome-installer/arm64/chromedriver-mac-arm64/chromedriver
+  mv -f /chrome-installer/arm64/chromedriver-mac-arm64/chromedriver /usr/local/bin/chromedriver
   mv /chrome-installer/arm64/ /chrome
   cp /chrome/chrome_sandbox /usr/local/sbin/chrome-devel-sandbox
   chown root:root /usr/local/sbin/chrome-devel-sandbox
   chmod 4755 /usr/local/sbin/chrome-devel-sandbox
 else
   apt-get install -y /chrome-installer/amd64/google-chrome-stable_124.0.6367.201-1_amd64.deb
-  chmod +x /chrome-installer/amd64/chromedriver
-  mv -f /chrome-installer/amd64/chromedriver /usr/local/bin/chromedriver
+  chmod +x /chrome-installer/amd64/chromedriver-linux64/chromedriver
+  mv -f /chrome-installer/amd64/chromedriver-linux64/chromedriver /usr/local/bin/chromedriver
 fi
 
 rm -rf /chrome-installer