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/kate.profile | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'etc/profile-a-l/kate.profile') diff --git a/etc/profile-a-l/kate.profile b/etc/profile-a-l/kate.profile index 152f73d5d..f141a25e1 100644 --- a/etc/profile-a-l/kate.profile +++ b/etc/profile-a-l/kate.profile @@ -28,17 +28,17 @@ noblacklist ${HOME}/.local/share/kxmlgui5/katesearch include allow-common-devel.inc include disable-common.inc -# include disable-devel.inc +#include disable-devel.inc include disable-exec.inc -# include disable-interpreters.inc +#include disable-interpreters.inc include disable-programs.inc include whitelist-run-common.inc include whitelist-var-common.inc -# apparmor +#apparmor caps.drop all -# net none +#net none netfilter nodvd nogroups @@ -52,13 +52,13 @@ novideo protocol unix seccomp -# private-bin kate,kbuildsycoca4,kdeinit4 +#private-bin kate,kbuildsycoca4,kdeinit4 private-dev -# private-etc alternatives,fonts,kde4rc,kde5rc,ld.so.cache,machine-id,xdg +#private-etc alternatives,fonts,kde4rc,kde5rc,ld.so.cache,machine-id,xdg private-tmp -# dbus-user none -# dbus-system none +#dbus-user none +#dbus-system none restrict-namespaces join-or-start kate -- cgit v1.2.3-70-g09d2