aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Fred Barclay <Fred-Barclay@users.noreply.github.com>2021-02-08 17:24:28 -0600
committerLibravatar Fred Barclay <Fred-Barclay@users.noreply.github.com>2021-02-08 17:24:28 -0600
commitad0b7fc88689aaa407cf2091f542b1ffb44d166b (patch)
tree89f9fde545d17a86edfe3ef8547db8ecea5f3584
parentMerge pull request #3961 from kmk3/fix-macro-usage (diff)
downloadfirejail-ad0b7fc88689aaa407cf2091f542b1ffb44d166b.tar.gz
firejail-ad0b7fc88689aaa407cf2091f542b1ffb44d166b.tar.zst
firejail-ad0b7fc88689aaa407cf2091f542b1ffb44d166b.zip
Housekeeping: strip extra whitespace
Just `find . -not \( -name .git -prune -o -name *.AppImage -prune \) -type f -print0 | xargs -0 perl -pi -e 's/ +$//'` and filter to avoid unwanted changes (especially .md files)
-rw-r--r--.github/ISSUE_TEMPLATE/bug_report.md2
-rw-r--r--.github/workflows/build-extra.yml4
-rw-r--r--.github/workflows/codeql-analysis.yml6
-rw-r--r--.github/workflows/sort.yml4
-rw-r--r--etc/profile-a-l/balsa.profile2
-rw-r--r--etc/profile-a-l/calligragemini.profile8
-rw-r--r--etc/profile-a-l/kdiff3.profile2
7 files changed, 14 insertions, 14 deletions
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index bf58e1dff..86baecf2f 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -25,7 +25,7 @@ Steps to reproduce the behavior:
25 25
26**Environment** 26**Environment**
27 - Linux distribution and version (ie output of `lsb_release -a`, `screenfetch` or `cat /etc/os-release`) 27 - Linux distribution and version (ie output of `lsb_release -a`, `screenfetch` or `cat /etc/os-release`)
28 - Firejail version (output of `firejail --version`) exclusive or used git commit (`git rev-parse HEAD`) 28 - Firejail version (output of `firejail --version`) exclusive or used git commit (`git rev-parse HEAD`)
29 29
30**Additional context** 30**Additional context**
31Other context about the problem like related errors to understand the problem. 31Other context about the problem like related errors to understand the problem.
diff --git a/.github/workflows/build-extra.yml b/.github/workflows/build-extra.yml
index 1468ef898..d026b9356 100644
--- a/.github/workflows/build-extra.yml
+++ b/.github/workflows/build-extra.yml
@@ -1,6 +1,6 @@
1name: Build-extra CI 1name: Build-extra CI
2 2
3on: 3on:
4 push: 4 push:
5 branches: [ master ] 5 branches: [ master ]
6 paths-ignore: 6 paths-ignore:
@@ -19,7 +19,7 @@ on:
19 - RELNOTES 19 - RELNOTES
20 - SECURITY.md 20 - SECURITY.md
21 - 'etc/**' 21 - 'etc/**'
22 22
23jobs: 23jobs:
24 build-clang: 24 build-clang:
25 if: ${{ ! contains(github.event.commits[0].message, '[skip ci]') }} 25 if: ${{ ! contains(github.event.commits[0].message, '[skip ci]') }}
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 301c7fad2..d974d650e 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -11,7 +11,7 @@ on:
11 paths-ignore: 11 paths-ignore:
12 - CONTRIBUTING.md 12 - CONTRIBUTING.md
13 - README 13 - README
14 - README.md 14 - README.md
15 - RELNOTES 15 - RELNOTES
16 - SECURITY.md 16 - SECURITY.md
17 - 'etc/**' 17 - 'etc/**'
@@ -21,7 +21,7 @@ on:
21 paths-ignore: 21 paths-ignore:
22 - CONTRIBUTING.md 22 - CONTRIBUTING.md
23 - README 23 - README
24 - README.md 24 - README.md
25 - RELNOTES 25 - RELNOTES
26 - SECURITY.md 26 - SECURITY.md
27 - 'etc/**' 27 - 'etc/**'
@@ -61,7 +61,7 @@ jobs:
61 with: 61 with:
62 languages: ${{ matrix.language }} 62 languages: ${{ matrix.language }}
63 # If you wish to specify custom queries, you can do so here or in a config file. 63 # If you wish to specify custom queries, you can do so here or in a config file.
64 # By default, queries listed here will override any specified in a config file. 64 # By default, queries listed here will override any specified in a config file.
65 # Prefix the list here with "+" to use these queries and those in the config file. 65 # Prefix the list here with "+" to use these queries and those in the config file.
66 # queries: ./path/to/local/query, your-org/your-repo/queries@main 66 # queries: ./path/to/local/query, your-org/your-repo/queries@main
67 67
diff --git a/.github/workflows/sort.yml b/.github/workflows/sort.yml
index 55ac065b6..878a5eb82 100644
--- a/.github/workflows/sort.yml
+++ b/.github/workflows/sort.yml
@@ -1,7 +1,7 @@
1name: sort.py 1name: sort.py
2 2
3on: 3on:
4 push: 4 push:
5 branches: [ master ] 5 branches: [ master ]
6 paths: 6 paths:
7 - 'etc/**' 7 - 'etc/**'
diff --git a/etc/profile-a-l/balsa.profile b/etc/profile-a-l/balsa.profile
index d755fd803..573776a71 100644
--- a/etc/profile-a-l/balsa.profile
+++ b/etc/profile-a-l/balsa.profile
@@ -61,7 +61,7 @@ shell none
61tracelog 61tracelog
62 62
63# disable-mnt 63# disable-mnt
64# Add "pinentry-curses,pinentry-emacs,pinentry-fltk,pinentry-gnome3,pinentry-gtk,pinentry-gtk2,pinentry-gtk-2,pinentry-qt,pinentry-qt4,pinentry-tty,pinentry-x2go,pinentry-kwallet" for gpg 64# Add "pinentry-curses,pinentry-emacs,pinentry-fltk,pinentry-gnome3,pinentry-gtk,pinentry-gtk2,pinentry-gtk-2,pinentry-qt,pinentry-qt4,pinentry-tty,pinentry-x2go,pinentry-kwallet" for gpg
65# Add "ignore private-bin" for hyperlinks or have a look at the private-bins in firefox.profile and firefox-common.profile. 65# Add "ignore private-bin" for hyperlinks or have a look at the private-bins in firefox.profile and firefox-common.profile.
66private-bin balsa,balsa-ab,gpg,gpg-agent,gpg2,gpgsm 66private-bin balsa,balsa-ab,gpg,gpg-agent,gpg2,gpgsm
67private-cache 67private-cache
diff --git a/etc/profile-a-l/calligragemini.profile b/etc/profile-a-l/calligragemini.profile
index 48527363d..006c307ab 100644
--- a/etc/profile-a-l/calligragemini.profile
+++ b/etc/profile-a-l/calligragemini.profile
@@ -5,8 +5,8 @@ include calligragemini.local
5# Persistent global definitions 5# Persistent global definitions
6# added by included profile 6# added by included profile
7#include globals.local 7#include globals.local
8 8
9noblacklist ${HOME}/.local/share/calligragemini 9noblacklist ${HOME}/.local/share/calligragemini
10 10
11# Redirect 11# Redirect
12include calligra.profile 12include calligra.profile
diff --git a/etc/profile-a-l/kdiff3.profile b/etc/profile-a-l/kdiff3.profile
index 8290e07f2..41840e3b0 100644
--- a/etc/profile-a-l/kdiff3.profile
+++ b/etc/profile-a-l/kdiff3.profile
@@ -19,7 +19,7 @@ include disable-passwdmgr.inc
19#include disable-programs.inc 19#include disable-programs.inc
20include disable-shell.inc 20include disable-shell.inc
21include disable-xdg.inc 21include disable-xdg.inc
22 22
23include whitelist-runuser-common.inc 23include whitelist-runuser-common.inc
24# Uncomment the next lines (or put it into your kdiff3.local) if you don't need to compare files in /usr/share. 24# Uncomment the next lines (or put it into your kdiff3.local) if you don't need to compare files in /usr/share.
25#include whitelist-usr-share-common.inc 25#include whitelist-usr-share-common.inc