From ad0b7fc88689aaa407cf2091f542b1ffb44d166b Mon Sep 17 00:00:00 2001 From: Fred Barclay Date: Mon, 8 Feb 2021 17:24:28 -0600 Subject: [PATCH] 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) --- .github/ISSUE_TEMPLATE/bug_report.md | 2 +- .github/workflows/build-extra.yml | 4 ++-- .github/workflows/codeql-analysis.yml | 6 +++--- .github/workflows/sort.yml | 4 ++-- etc/profile-a-l/balsa.profile | 2 +- etc/profile-a-l/calligragemini.profile | 8 ++++---- etc/profile-a-l/kdiff3.profile | 2 +- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index bf58e1dffdf..86baecf2f47 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -25,7 +25,7 @@ Steps to reproduce the behavior: **Environment** - Linux distribution and version (ie output of `lsb_release -a`, `screenfetch` or `cat /etc/os-release`) - - Firejail version (output of `firejail --version`) exclusive or used git commit (`git rev-parse HEAD`) + - Firejail version (output of `firejail --version`) exclusive or used git commit (`git rev-parse HEAD`) **Additional context** Other 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 1468ef8985e..d026b935690 100644 --- a/.github/workflows/build-extra.yml +++ b/.github/workflows/build-extra.yml @@ -1,6 +1,6 @@ name: Build-extra CI -on: +on: push: branches: [ master ] paths-ignore: @@ -19,7 +19,7 @@ on: - RELNOTES - SECURITY.md - 'etc/**' - + jobs: build-clang: if: ${{ ! contains(github.event.commits[0].message, '[skip ci]') }} diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 301c7fad27a..d974d650eb3 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -11,7 +11,7 @@ on: paths-ignore: - CONTRIBUTING.md - README - - README.md + - README.md - RELNOTES - SECURITY.md - 'etc/**' @@ -21,7 +21,7 @@ on: paths-ignore: - CONTRIBUTING.md - README - - README.md + - README.md - RELNOTES - SECURITY.md - 'etc/**' @@ -61,7 +61,7 @@ jobs: with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. - # By default, queries listed here will override any specified in a config file. + # By default, queries listed here will override any specified in a config file. # Prefix the list here with "+" to use these queries and those in the config file. # queries: ./path/to/local/query, your-org/your-repo/queries@main diff --git a/.github/workflows/sort.yml b/.github/workflows/sort.yml index 55ac065b6d0..878a5eb82d9 100644 --- a/.github/workflows/sort.yml +++ b/.github/workflows/sort.yml @@ -1,7 +1,7 @@ name: sort.py -on: - push: +on: + push: branches: [ master ] paths: - 'etc/**' diff --git a/etc/profile-a-l/balsa.profile b/etc/profile-a-l/balsa.profile index d755fd80391..573776a71d3 100644 --- a/etc/profile-a-l/balsa.profile +++ b/etc/profile-a-l/balsa.profile @@ -61,7 +61,7 @@ shell none tracelog # disable-mnt -# 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 +# 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 # Add "ignore private-bin" for hyperlinks or have a look at the private-bins in firefox.profile and firefox-common.profile. private-bin balsa,balsa-ab,gpg,gpg-agent,gpg2,gpgsm private-cache diff --git a/etc/profile-a-l/calligragemini.profile b/etc/profile-a-l/calligragemini.profile index 48527363d09..006c307ab0f 100644 --- a/etc/profile-a-l/calligragemini.profile +++ b/etc/profile-a-l/calligragemini.profile @@ -5,8 +5,8 @@ include calligragemini.local # Persistent global definitions # added by included profile #include globals.local - -noblacklist ${HOME}/.local/share/calligragemini - -# Redirect + +noblacklist ${HOME}/.local/share/calligragemini + +# Redirect include calligra.profile diff --git a/etc/profile-a-l/kdiff3.profile b/etc/profile-a-l/kdiff3.profile index 8290e07f2b6..41840e3b0c2 100644 --- a/etc/profile-a-l/kdiff3.profile +++ b/etc/profile-a-l/kdiff3.profile @@ -19,7 +19,7 @@ include disable-passwdmgr.inc #include disable-programs.inc include disable-shell.inc include disable-xdg.inc - + include whitelist-runuser-common.inc # Uncomment the next lines (or put it into your kdiff3.local) if you don't need to compare files in /usr/share. #include whitelist-usr-share-common.inc