From 3812c139a6580113572f68ea1a8fd277d410777c Mon Sep 17 00:00:00 2001 From: "Kelvin M. Klann" Date: Fri, 17 Feb 2023 18:25:34 -0300 Subject: Fix EOL at EOF Commands used to search and replace: $ git grep -Ilz '.' | xargs -0 -I '{}' sh -c \ "printf '%s\n' \"\$(cat '{}')\" >'{}'" The above commands ensure that there is exaclty 1 line terminator at EOF (rather than 0 or more than 1) on all non-empty text files. This fixes all of the "new blank line at EOF" errors raised by git: $ git diff --check 4b825dc642cb6eb9a060e54bf8d69288fbee4904..HEAD | grep '^[^+]' | cut -f 3 -d : | LC_ALL=C sort | uniq -c 21 new blank line at EOF. 72 space before tab in indent. 4 trailing whitespace. --- etc/profile-a-l/bibtex.profile | 1 - etc/profile-a-l/latex.profile | 1 - etc/profile-m-z/pdflatex.profile | 1 - etc/profile-m-z/presentations18.profile | 1 - etc/profile-m-z/tex.profile | 1 - etc/profile-m-z/textmaker18.profile | 1 - etc/profile-m-z/textmaker18free.profile | 1 - 7 files changed, 7 deletions(-) (limited to 'etc') diff --git a/etc/profile-a-l/bibtex.profile b/etc/profile-a-l/bibtex.profile index e868dcbab..5f12d61f1 100644 --- a/etc/profile-a-l/bibtex.profile +++ b/etc/profile-a-l/bibtex.profile @@ -9,4 +9,3 @@ private-bin bibtex # Redirect include latex-common.profile - diff --git a/etc/profile-a-l/latex.profile b/etc/profile-a-l/latex.profile index 2230dd570..f6e625d35 100644 --- a/etc/profile-a-l/latex.profile +++ b/etc/profile-a-l/latex.profile @@ -9,4 +9,3 @@ private-bin latex # Redirect include latex-common.profile - diff --git a/etc/profile-m-z/pdflatex.profile b/etc/profile-m-z/pdflatex.profile index caf980d4d..ddf6d0990 100644 --- a/etc/profile-m-z/pdflatex.profile +++ b/etc/profile-m-z/pdflatex.profile @@ -9,4 +9,3 @@ private-bin pdflatex # Redirect include latex-common.profile - diff --git a/etc/profile-m-z/presentations18.profile b/etc/profile-m-z/presentations18.profile index 65d684c40..ac844d1af 100644 --- a/etc/profile-m-z/presentations18.profile +++ b/etc/profile-m-z/presentations18.profile @@ -8,4 +8,3 @@ include globals.local # Redirect include softmaker-common.profile - diff --git a/etc/profile-m-z/tex.profile b/etc/profile-m-z/tex.profile index f56c3038e..c850cf5c3 100644 --- a/etc/profile-m-z/tex.profile +++ b/etc/profile-m-z/tex.profile @@ -9,4 +9,3 @@ private-bin tex # Redirect include latex-common.profile - diff --git a/etc/profile-m-z/textmaker18.profile b/etc/profile-m-z/textmaker18.profile index e5a4b6454..8284df791 100644 --- a/etc/profile-m-z/textmaker18.profile +++ b/etc/profile-m-z/textmaker18.profile @@ -8,4 +8,3 @@ include globals.local # Redirect include softmaker-common.profile - diff --git a/etc/profile-m-z/textmaker18free.profile b/etc/profile-m-z/textmaker18free.profile index 0e918bf0a..ad945ca55 100644 --- a/etc/profile-m-z/textmaker18free.profile +++ b/etc/profile-m-z/textmaker18free.profile @@ -8,4 +8,3 @@ include globals.local # Redirect include softmaker-common.profile - -- cgit v1.2.3-70-g09d2 From 452d70cc77ddb308408c4d4da3a81a4b74530b65 Mon Sep 17 00:00:00 2001 From: "Kelvin M. Klann" Date: Sun, 19 Feb 2023 13:11:10 -0300 Subject: Trim trailing whitespace Commands used to search and replace: $ git grep -Ilz '[[:blank:]]$' | xargs -0 -I '{}' sh -c "printf '%s\n' \"\$(sed -E \ 's/[[:blank:]]+$//' '{}')\" >'{}'" This fixes all of the "trailing whitespace" errors raised by git: $ git diff --check 4b825dc642cb6eb9a060e54bf8d69288fbee4904..HEAD | grep '^[^+]' | cut -f 3 -d : | LC_ALL=C sort | uniq -c 72 space before tab in indent. 4 trailing whitespace. --- .github/ISSUE_TEMPLATE/bug_report.md | 2 +- .github/pull_request_template.md | 4 ++-- etc/profile-m-z/rpcs3.profile | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'etc') diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index c8c6f40bd..53066013d 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -81,7 +81,7 @@ output goes here
Output of LC_ALL=C firejail --debug /path/to/program

- + diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 7cb92a938..3c256dd87 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -1,9 +1,9 @@ If your PR isn't about profiles or you have no idea how to do one of these, skip the following and go ahead with this PR. If you submit a PR for new profiles or changing profiles, please do the following: - - The ordering of options follow the rules described in [/usr/share/doc/firejail/profile.template](https://github.com/netblue30/firejail/blob/master/etc/templates/profile.template). + - The ordering of options follow the rules described in [/usr/share/doc/firejail/profile.template](https://github.com/netblue30/firejail/blob/master/etc/templates/profile.template). > Hint: The profile-template is very new. If you install firejail with your package manager, it may be missing. In order to follow the latest rules, it is recommended to use the template from the repository. - - Order the arguments of options alphabetically. You can easily do this with [sort.py](https://github.com/netblue30/firejail/tree/master/contrib/sort.py). + - Order the arguments of options alphabetically. You can easily do this with [sort.py](https://github.com/netblue30/firejail/tree/master/contrib/sort.py). The path to it depends on your distro: | Distro | Path | diff --git a/etc/profile-m-z/rpcs3.profile b/etc/profile-m-z/rpcs3.profile index 186e31b46..405ab818d 100644 --- a/etc/profile-m-z/rpcs3.profile +++ b/etc/profile-m-z/rpcs3.profile @@ -2,7 +2,7 @@ # Description: RPCS3 emulator # This file is overwritten after every install/update # Persistent local customizations -include rpcs3.local +include rpcs3.local # Persistent global definitions include globals.local -- cgit v1.2.3-70-g09d2