From 5de241c2c6aec218269618c3152268d9939d47eb Mon Sep 17 00:00:00 2001 From: "mr. M" Date: Sat, 4 Jan 2025 02:33:00 +0100 Subject: [PATCH] Clean up whitespace and formatting in various files; update CODEOWNERS and .gitignore --- .github/workflows/code-linter.yml | 1 - .github/workflows/src/release-build.sh | 2 +- .gitignore | 1 - .prettierignore | 3 +++ CODEOWNERS | 2 +- l10n | 2 +- scripts/download-language-packs.sh | 1 - scripts/update-en-US-packs.sh | 1 - src/browser/base/content/zen-avatars/.gitignore | 2 +- .../themes/shared/zen-icons/update-resources.sh | 10 +++++----- 10 files changed, 12 insertions(+), 13 deletions(-) diff --git a/.github/workflows/code-linter.yml b/.github/workflows/code-linter.yml index fde86ce94..7e495b586 100644 --- a/.github/workflows/code-linter.yml +++ b/.github/workflows/code-linter.yml @@ -31,4 +31,3 @@ jobs: - name: Lint run: pnpm lint - diff --git a/.github/workflows/src/release-build.sh b/.github/workflows/src/release-build.sh index d1825ec1a..809032a9a 100644 --- a/.github/workflows/src/release-build.sh +++ b/.github/workflows/src/release-build.sh @@ -20,7 +20,7 @@ if ! command -v Xvfb &> /dev/null; then else echo "Xvfb could not be found, running without it" echo "ASSUMING YOU ARE RUNNING THIS ON MACOS" - + set -v export ZEN_RELEASE=1 pnpm build diff --git a/.gitignore b/.gitignore index 97b081896..d57494754 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,3 @@ - .dotbuild/ engine/ firefox-*/ diff --git a/.prettierignore b/.prettierignore index cfae2c0c9..839364df1 100644 --- a/.prettierignore +++ b/.prettierignore @@ -14,7 +14,10 @@ pnpm-lock.yaml docs/issue-metrics/*.md +.husky/ + # Some CSS files are preprocessed and prettier doesn't handle them well # We also dont want to format the CSS files that are generated by the build src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css src/browser/base/zen-components/ZenEmojies.mjs +build/codesign/codesign.bash diff --git a/CODEOWNERS b/CODEOWNERS index 74d965bca..64c09c8d3 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -1 +1 @@ -* @mr-cheff +* @mr-cheff diff --git a/l10n b/l10n index 8ef008fb6..d444262fd 160000 --- a/l10n +++ b/l10n @@ -1 +1 @@ -Subproject commit 8ef008fb65093e7f5b604725bd6960e1a07b17eb +Subproject commit d444262fdb32071eb995c5266ad4fe8846f650f1 diff --git a/scripts/download-language-packs.sh b/scripts/download-language-packs.sh index 7fa70478f..adff0978f 100644 --- a/scripts/download-language-packs.sh +++ b/scripts/download-language-packs.sh @@ -1,4 +1,3 @@ - set -ex CURRENT_DIR=$(pwd) diff --git a/scripts/update-en-US-packs.sh b/scripts/update-en-US-packs.sh index 959312753..7e37a09ad 100644 --- a/scripts/update-en-US-packs.sh +++ b/scripts/update-en-US-packs.sh @@ -1,2 +1 @@ - sh ./scripts/copy-language-pack.sh en-US diff --git a/src/browser/base/content/zen-avatars/.gitignore b/src/browser/base/content/zen-avatars/.gitignore index b4ffc862b..8788763db 100644 --- a/src/browser/base/content/zen-avatars/.gitignore +++ b/src/browser/base/content/zen-avatars/.gitignore @@ -1,2 +1,2 @@ # TODO: should they be included in the repo? -# *.svg \ No newline at end of file +# *.svg diff --git a/src/browser/themes/shared/zen-icons/update-resources.sh b/src/browser/themes/shared/zen-icons/update-resources.sh index f27b31410..2fae861b2 100644 --- a/src/browser/themes/shared/zen-icons/update-resources.sh +++ b/src/browser/themes/shared/zen-icons/update-resources.sh @@ -1,15 +1,15 @@ # note: you need to be in the same directory as the script to run it if [ $(basename $PWD) != "zen-icons" ]; then - echo "You need to be in the zen-icons directory to run this script" - exit 1 + echo "You need to be in the zen-icons directory to run this script" + exit 1 fi echo "" > jar.inc.mn for filename in *; do - echo "Working on $filename" - echo " skin/classic/browser/zen-icons/$filename (../shared/zen-icons/$filename) " >> jar.inc.mn + echo "Working on $filename" + echo " skin/classic/browser/zen-icons/$filename (../shared/zen-icons/$filename) " >> jar.inc.mn done -echo "Done!" \ No newline at end of file +echo "Done!"