From c6d33375cc34e4e5e527ab43c219adfbc8848c62 Mon Sep 17 00:00:00 2001 From: "Kelvin M. Klann" Date: Fri, 11 Aug 2023 05:26:05 -0300 Subject: profiles: fix commented code and eol comments Main changes: * Remove the space after `#` for commented code lines to distinguish them from normal comments * Use `#` instead of `-` for comments at the end of the line so that commented code lines work after being uncommented Commands used to search and replace: arg0="$(cat contrib/syntax/lists/profile_commands_arg0.list | LC_ALL=C sort -u | tr '\n' '|' | sed -e 's/|$//' -e 's/\./\\./g')" arg1="$(cat contrib/syntax/lists/profile_commands_arg1.list | LC_ALL=C sort -u | tr '\n' '|' | sed -e 's/|$//' -e 's/\./\\./g')" git ls-files -z -- etc/inc etc/profile* | xargs -0 -I '{}' \ sh -c "printf '%s\n' \"\$(sed -E \ -e 's/^# ($arg0)( [#-]-? .*)?\$/#\\1\\2/' \ -e 's/^# ($arg1)( [^ ]*)?( [#-]-? .*)?\$/#\\1\\2\\3/' \ -e 's/^# (whitelist \\$)/#\\1/' \ -e 's/^(#[^ ].+) --? /\\1 # /' \ '{}')\" >'{}'" Commands used to check for leftover entries: arg0="$(cat contrib/syntax/lists/profile_commands_arg0.list | LC_ALL=C sort -u | tr '\n' '|' | sed -e 's/|$//' -e 's/\./\\./g')" arg1="$(cat contrib/syntax/lists/profile_commands_arg1.list | LC_ALL=C sort -u | tr '\n' '|' | sed -e 's/|$//' -e 's/\./\\./g')" git grep -E "^# ($arg0|$arg1)( +|$)" -- etc/inc etc/profile* See also commit 30f9ad908 ("build: improve comments in firecfg.config", 2023-08-05) / PR #5942. --- etc/profile-a-l/kfind.profile | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'etc/profile-a-l/kfind.profile') diff --git a/etc/profile-a-l/kfind.profile b/etc/profile-a-l/kfind.profile index c70030a38..115f785eb 100644 --- a/etc/profile-a-l/kfind.profile +++ b/etc/profile-a-l/kfind.profile @@ -9,21 +9,21 @@ include globals.local # searching in blacklisted or masked paths fails silently # adjust filesystem restrictions as necessary -# noblacklist ${HOME}/.cache/kfind - disable-programs.inc is disabled, see below -# noblacklist ${HOME}/.config/kfindrc -# noblacklist ${HOME}/.kde/share/config/kfindrc -# noblacklist ${HOME}/.kde4/share/config/kfindrc +#noblacklist ${HOME}/.cache/kfind # disable-programs.inc is disabled, see below +#noblacklist ${HOME}/.config/kfindrc +#noblacklist ${HOME}/.kde/share/config/kfindrc +#noblacklist ${HOME}/.kde4/share/config/kfindrc include disable-common.inc include disable-devel.inc include disable-exec.inc include disable-interpreters.inc -# include disable-programs.inc +#include disable-programs.inc apparmor caps.drop all machine-id -# net none +#net none netfilter no3d nodvd @@ -38,11 +38,11 @@ novideo protocol unix seccomp -# private-bin kbuildsycoca4,kdeinit4,kfind +#private-bin kbuildsycoca4,kdeinit4,kfind private-dev private-tmp -# dbus-user none -# dbus-system none +#dbus-user none +#dbus-system none restrict-namespaces -- cgit v1.2.3-70-g09d2