diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e78c7994..a3c8132e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -385,23 +385,23 @@ jobs: set -eux export ARCH=${{ matrix.arch }} UPINFO="gh-releases-zsync|$GITHUB_REPOSITORY_OWNER|desktop|latest|zen-$ARCH.AppImage.zsync" - rm AppDir/.DirIcon || true - cp configs/branding/${{ inputs.update_branch }}/logo128.png AppDir/usr/share/icons/hicolor/128x128/apps/zen.png - cp configs/branding/${{ inputs.update_branch }}/logo128.png AppDir/zen.png && ln -s zen.png AppDir/.DirIcon + rm build/AppDir/.DirIcon || true + cp configs/branding/${{ inputs.update_branch }}/logo128.png build/AppDir/usr/share/icons/hicolor/128x128/apps/zen.png + cp configs/branding/${{ inputs.update_branch }}/logo128.png build/AppDir/zen.png && ln -s zen.png build/AppDir/.DirIcon if [ "${{ inputs.update_branch }}" = "twilight" ]; then - sed -i -e 's/Name=Zen Browser/Name=Zen Twilight/g' AppDir/zen.desktop - sed -i -e 's/StartupWMClass=zen/StartupWMClass=zen-twilight/g' AppDir/zen.desktop + sed -i -e 's/Name=Zen Browser/Name=Zen Twilight/g' build/AppDir/zen.desktop + sed -i -e 's/StartupWMClass=zen/StartupWMClass=zen-twilight/g' build/AppDir/zen.desktop fi - APPDIR=AppDir + APPDIR=build/AppDir tar -xvf *.tar.* && rm -rf *.tar.* mv zen/* $APPDIR/ wget "https://github.com/AppImage/appimagetool/releases/download/continuous/appimagetool-x86_64.AppImage" wget "https://github.com/VHSgunzo/uruntime/releases/latest/download/uruntime-appimage-squashfs-lite-$ARCH" chmod +x *.AppImage chmod +x ./uruntime-appimage-squashfs-lite-"$ARCH" - chmod +x ./AppDir/AppRun + chmod +x ./build/AppDir/AppRun # keep the uruntime mountpoint (massively speeds up launch time) sed -i 's|URUNTIME_MOUNT=[0-9]|URUNTIME_MOUNT=0|' ./uruntime-appimage-squashfs-lite-"$ARCH" @@ -628,7 +628,7 @@ jobs: pwd ls . ls .. - mv releases.xml ./flatpak/app.zen_browser.zen.metainfo.xml + mv releases.xml ./build/flatpak/app.zen_browser.zen.metainfo.xml # output the version to the file echo -n ${{ needs.build-data.outputs.version }} > ./flatpak/version diff --git a/AppDir/AppRun b/build/AppDir/AppRun similarity index 100% rename from AppDir/AppRun rename to build/AppDir/AppRun diff --git a/AppDir/distribution/policies.json b/build/AppDir/distribution/policies.json similarity index 100% rename from AppDir/distribution/policies.json rename to build/AppDir/distribution/policies.json diff --git a/AppDir/usr/share/icons/hicolor/128x128/apps/.gitkeep b/build/AppDir/usr/share/icons/hicolor/128x128/apps/.gitkeep similarity index 100% rename from AppDir/usr/share/icons/hicolor/128x128/apps/.gitkeep rename to build/AppDir/usr/share/icons/hicolor/128x128/apps/.gitkeep diff --git a/AppDir/zen.desktop b/build/AppDir/zen.desktop similarity index 100% rename from AppDir/zen.desktop rename to build/AppDir/zen.desktop diff --git a/firefox-cache/l10n-last-commit-hash b/build/firefox-cache/l10n-last-commit-hash similarity index 100% rename from firefox-cache/l10n-last-commit-hash rename to build/firefox-cache/l10n-last-commit-hash diff --git a/flatpak/app.zen_browser.zen.yml.template b/build/flatpak/app.zen_browser.zen.yml.template similarity index 100% rename from flatpak/app.zen_browser.zen.yml.template rename to build/flatpak/app.zen_browser.zen.yml.template diff --git a/scripts/update_ff.py b/scripts/update_ff.py index 0784d2f9..f8e5bc7e 100644 --- a/scripts/update_ff.py +++ b/scripts/update_ff.py @@ -62,13 +62,13 @@ def update_l10n_last_commit_hash(): try: os.system(f"git clone {L10N_REPO} l10n-temp --depth 1") if not os.path.exists("firefox-cache"): - os.mkdir("firefox-cache") - os.system("cat l10n-temp/.git/refs/heads/main > firefox-cache/l10n-last-commit-hash") + os.mkdir("build/firefox-cache") + os.system("cat l10n-temp/.git/refs/heads/main > build/firefox-cache/l10n-last-commit-hash") # Remove new line character data = "" - with open("firefox-cache/l10n-last-commit-hash", "r") as f: + with open("build/firefox-cache/l10n-last-commit-hash", "r") as f: data = f.read() - with open("firefox-cache/l10n-last-commit-hash", "w") as f: + with open("build/firefox-cache/l10n-last-commit-hash", "w") as f: f.write(data.strip()) except KeyboardInterrupt: print("Exiting...")