From ba1d686795df95bcdc3093059f72b7b6a37e435f Mon Sep 17 00:00:00 2001
From: Raymond Hill <rhill@raymondhill.net>
Date: Fri, 7 Apr 2023 13:34:27 -0400
Subject: [PATCH] Fix github-actions re uBO Lite

---
 .github/workflows/mv3.yml | 4 ++--
 tools/make-mv3.sh         | 6 +++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/mv3.yml b/.github/workflows/mv3.yml
index 47ea81643..fec1f20f0 100644
--- a/.github/workflows/mv3.yml
+++ b/.github/workflows/mv3.yml
@@ -28,7 +28,7 @@ jobs:
           echo "TAGNAME=$(basename $(ls dist/build/uBOLite_*.chromium.mv3.zip) .chromium.mv3.zip)" >> $GITHUB_ENV
           RELEASENAME=${TAGNAME/_/ }
           echo "RELEASENAME=$RELEASENAME" >> $GITHUB_ENV
-          cp dist/build/uBOLite.chromium.mv3/log.txt dist/mv3/
+          cp dist/build/uBOLite.chromium/log.txt dist/mv3/
       - name: Commit uBOLite MV3 build log file
         # https://github.com/marketplace/actions/github-action-for-committing-changes-to-a-repository
         uses: devops-infra/action-commit-push@master
@@ -56,7 +56,7 @@ jobs:
       - name: Build Firefox uBOLite MV3 packages
         run: |
           tools/make-mv3.sh firefox full
-          echo "PACKAGE=$(basename $(ls dist/build/uBOLite_*.firefox.mv3.zip))" >> $GITHUB_ENV
+          echo "PACKAGE=$(basename $(ls dist/build/uBOLite_*.firefox.mv3.xpi))" >> $GITHUB_ENV
       - name: Upload Firefox uBOLite MV3 package
         uses: actions/upload-release-asset@v1
         env:
diff --git a/tools/make-mv3.sh b/tools/make-mv3.sh
index 4b52f09ec..1c6a571c5 100755
--- a/tools/make-mv3.sh
+++ b/tools/make-mv3.sh
@@ -95,8 +95,12 @@ echo "*** uBOLite.mv3: extension ready"
 echo "Extension location: $DES/"
 
 if [ "$FULL" = "yes" ]; then
+    EXTENSION="zip"
+    if [ "$PLATFORM" = "firefox" ]; then
+        EXTENSION="xpi"
+    fi
     echo "*** uBOLite.mv3: Creating publishable package..."
-    PACKAGENAME="uBOLite_$(jq -r .version $DES/manifest.json).$PLATFORM.mv3.zip"
+    PACKAGENAME="uBOLite_$(jq -r .version $DES/manifest.json).$PLATFORM.mv3.$EXTENSION"
     TMPDIR=$(mktemp -d)
     mkdir -p $TMPDIR
     cp -R $DES/* $TMPDIR/