From 37208ccdf8737f94b8bad97d65bef4e2bd296fa9 Mon Sep 17 00:00:00 2001 From: Aminda Suomalainen Date: Thu, 6 Jun 2024 20:38:36 +0300 Subject: [PATCH] run prettier-plugin-sh --- .gitattributes | 60 ++++++++++++++-------------- CODEOWNERS | 2 +- Windows/.gitattributes | 4 +- etc/systemd-resolv.conf-restore.bash | 2 +- local/share/applications/README.md | 3 +- 5 files changed, 36 insertions(+), 35 deletions(-) diff --git a/.gitattributes b/.gitattributes index 1c070579..240e1e4b 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,6 +1,6 @@ # If file is text, use lf line-endings and let forges show it in repo # languages. For more information: `man gitattributes` -* text=auto eol=lf linguist-detectable +* text=auto eol=lf linguist-detectable # Suggestions for inevitably encountering .gitattributeless repositories when # .gitattributes cannot be added: @@ -26,33 +26,33 @@ # TODO # diff=matlab # diff=pascal -*.{adb,ads} diff=ada -*.bibtex diff=bibtex -*.cs diff=csharp -*.{c,cpp} diff=cpp -*.css diff=css -*.dts diff=dts -*.{ex,exs} diff=elixir -*.{f90,f,for} diff=fortran -*.fountain diff=fountain -*.go diff=golang -*.html diff=html -*.java diff=java -*.{kt,kts} diff=kotlin -*.{h,m,mm,M} diff=objc -*.pl diff=perl -*.php diff=php -*.py diff=python -*.rb diff=ruby -*.{rs,rlib} diff=rust -*.{scm,ss} diff=scheme -*.tex diff=tex +*.{adb,ads} diff=ada +*.bibtex diff=bibtex +*.cs diff=csharp +*.{c,cpp} diff=cpp +*.css diff=css +*.dts diff=dts +*.{ex,exs} diff=elixir +*.{f90,f,for} diff=fortran +*.fountain diff=fountain +*.go diff=golang +*.html diff=html +*.java diff=java +*.{kt,kts} diff=kotlin +*.{h,m,mm,M} diff=objc +*.pl diff=perl +*.php diff=php +*.py diff=python +*.rb diff=ruby +*.{rs,rlib} diff=rust +*.{scm,ss} diff=scheme +*.tex diff=tex # bash & co aren't often Windows, so alway have lf line-endings regarldess # of the above. Markdown is also included as I utilise doctoc, which # requires lf line-endings. *.{sh,bash,zsh} diff=bash eol=lf -*.{md,markdown,[mM][dD],[mM][aA][rR][kK][dD][oO][wW][nN]} diff=markdown eol=lf +*.{md,markdown,[mM][dD],[mM][aA][rR][kK][dD][oO][wW][nN]} diff=markdown eol=lf # While this file is like .gitignore, negative patterns are forbidden and # directory/ wouldn't recurse, thus directory/**. Also !attribute would set @@ -65,16 +65,16 @@ Windows/** text=auto eol=crlf # The "text" attribute is used as otherwise they rely on auto-detection of # textness since there is no diff attribute set. # Ref: https://rehansaeed.com/gitattributes-best-practices/#line-endings -*.{reg,[rR][eE][gG]} text eol=crlf -*.{bat,[bB][aA][tT]} text eol=crlf -*.{ahk,[aA][hH][kK]} text eol=crlf +*.{reg,[rR][eE][gG]} text eol=crlf +*.{bat,[bB][aA][tT]} text eol=crlf +*.{ahk,[aA][hH][kK]} text eol=crlf # These files are scary, let's not touch them. The attribute "lockable" is # provided by git-lfs. https://github.com/git-lfs/git-lfs/wiki/File-Locking -LICENSE text lockable -CITATION.cff text lockable +LICENSE text lockable +CITATION.cff text lockable # NOTE! .gitattributes doesn't support the case-insensitive style above! -package.json text linguist-vendored -pnpm-lock.yaml text linguist-vendored +package.json text linguist-vendored +pnpm-lock.yaml text linguist-vendored diff --git a/CODEOWNERS b/CODEOWNERS index 8c96a518..f9ff4c49 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -1 +1 @@ -* @Mikaela +* @Mikaela diff --git a/Windows/.gitattributes b/Windows/.gitattributes index c05a0918..65a47f65 100644 --- a/Windows/.gitattributes +++ b/Windows/.gitattributes @@ -1,2 +1,2 @@ -* text=auto eol=crlf -*.{md,markdown} text eol=lf +* text=auto eol=crlf +*.{md,markdown} text eol=lf diff --git a/etc/systemd-resolv.conf-restore.bash b/etc/systemd-resolv.conf-restore.bash index c1cf89ff..e638d50b 100755 --- a/etc/systemd-resolv.conf-restore.bash +++ b/etc/systemd-resolv.conf-restore.bash @@ -6,7 +6,7 @@ set -x # I know there are old versions that used something else, but I don't remember # that name and they are ancient. -if ! hash resolvectl 2>/dev/null; then +if ! hash resolvectl 2> /dev/null; then echo "You don't seem to have systemd-resolved (or resolvectl) installed." 1>&2 exit 1 fi diff --git a/local/share/applications/README.md b/local/share/applications/README.md index 5fdc82da..6c3b5900 100644 --- a/local/share/applications/README.md +++ b/local/share/applications/README.md @@ -52,7 +52,8 @@ inode/directory=org.gnome.Nautilus.desktop; ```bash % grep directory /usr/share/applications/mimeinfo.cache -inode/directory=codium.desktop;org.gnome.Nautilus.desktop; +inode/directory=codium.desktop +org.gnome.Nautilus.desktop ``` TODO: I wonder if it needs an `update-desktop-database` or similar though.