aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Kelvin M. Klann <kmk3.code@protonmail.com>2023-02-19 13:11:10 -0300
committerLibravatar Kelvin M. Klann <kmk3.code@protonmail.com>2023-02-19 20:57:24 -0300
commit452d70cc77ddb308408c4d4da3a81a4b74530b65 (patch)
tree3c1bf34da0ca7eea125bf4ec3a8676d26b31670e
parentFix EOL at EOF (diff)
downloadfirejail-452d70cc77ddb308408c4d4da3a81a4b74530b65.tar.gz
firejail-452d70cc77ddb308408c4d4da3a81a4b74530b65.tar.zst
firejail-452d70cc77ddb308408c4d4da3a81a4b74530b65.zip
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.
-rw-r--r--.github/ISSUE_TEMPLATE/bug_report.md2
-rw-r--r--.github/pull_request_template.md4
-rw-r--r--etc/profile-m-z/rpcs3.profile2
3 files changed, 4 insertions, 4 deletions
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
81<details> 81<details>
82<summary>Output of <code>LC_ALL=C firejail --debug /path/to/program</code></summary> 82<summary>Output of <code>LC_ALL=C firejail --debug /path/to/program</code></summary>
83<p> 83<p>
84 84
85<!-- If the output is too long to embed it into the comment, 85<!-- If the output is too long to embed it into the comment,
86 create a secret gist at https://gist.github.com/ and link it here. --> 86 create a secret gist at https://gist.github.com/ and link it here. -->
87 87
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 @@
1If 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. 1If 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.
2 2
3If you submit a PR for new profiles or changing profiles, please do the following: 3If you submit a PR for new profiles or changing profiles, please do the following:
4 - 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). 4 - 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).
5 > 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. 5 > 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.
6 - Order the arguments of options alphabetically. You can easily do this with [sort.py](https://github.com/netblue30/firejail/tree/master/contrib/sort.py). 6 - Order the arguments of options alphabetically. You can easily do this with [sort.py](https://github.com/netblue30/firejail/tree/master/contrib/sort.py).
7 The path to it depends on your distro: 7 The path to it depends on your distro:
8 8
9 | Distro | Path | 9 | 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 @@
2# Description: RPCS3 emulator 2# Description: RPCS3 emulator
3# This file is overwritten after every install/update 3# This file is overwritten after every install/update
4# Persistent local customizations 4# Persistent local customizations
5include rpcs3.local 5include rpcs3.local
6# Persistent global definitions 6# Persistent global definitions
7include globals.local 7include globals.local
8 8