From 1441a042b614197af04e6f9984056d9a8ecb859e Mon Sep 17 00:00:00 2001 From: John Turner Date: Fri, 22 Aug 2025 00:41:15 -0400 Subject: tweak module names to make them more readable --- src/file/conffile/confshellexecfile.cil | 12 ------------ src/file/conffile/meson.build | 2 +- src/file/conffile/shellexecfile.cil | 12 ++++++++++++ src/file/homefile/userhomefile/meson.build | 2 +- src/file/homefile/userhomefile/shellrcfile.cil | 17 +++++++++++++++++ src/file/homefile/userhomefile/userhomeshellrcfile.cil | 17 ----------------- 6 files changed, 31 insertions(+), 31 deletions(-) delete mode 100644 src/file/conffile/confshellexecfile.cil create mode 100644 src/file/conffile/shellexecfile.cil create mode 100644 src/file/homefile/userhomefile/shellrcfile.cil delete mode 100644 src/file/homefile/userhomefile/userhomeshellrcfile.cil (limited to 'src') diff --git a/src/file/conffile/confshellexecfile.cil b/src/file/conffile/confshellexecfile.cil deleted file mode 100644 index 8c03d55..0000000 --- a/src/file/conffile/confshellexecfile.cil +++ /dev/null @@ -1,12 +0,0 @@ -(block shellexec - (block conf - (blockinherit .file.conf.template) - - (filecon "/etc/profile" file file_context) - (filecon "/etc/profile\.env" file file_context) - (filecon "/etc/profile\.d" dir file_context) - (filecon "/etc/profile\.d/.*" file file_context) - (filecon "/etc/bash" dir file_context) - (filecon "/etc/bash/.*" file file_context) - (filecon "/etc/zsh" dir file_context) - (filecon "/etc/zsh/.*" file file_context))) diff --git a/src/file/conffile/meson.build b/src/file/conffile/meson.build index 09b32a5..2db0142 100644 --- a/src/file/conffile/meson.build +++ b/src/file/conffile/meson.build @@ -1 +1 @@ -modules += files('confshellexecfile.cil') +modules += files('shellexecfile.cil') diff --git a/src/file/conffile/shellexecfile.cil b/src/file/conffile/shellexecfile.cil new file mode 100644 index 0000000..8c03d55 --- /dev/null +++ b/src/file/conffile/shellexecfile.cil @@ -0,0 +1,12 @@ +(block shellexec + (block conf + (blockinherit .file.conf.template) + + (filecon "/etc/profile" file file_context) + (filecon "/etc/profile\.env" file file_context) + (filecon "/etc/profile\.d" dir file_context) + (filecon "/etc/profile\.d/.*" file file_context) + (filecon "/etc/bash" dir file_context) + (filecon "/etc/bash/.*" file file_context) + (filecon "/etc/zsh" dir file_context) + (filecon "/etc/zsh/.*" file file_context))) diff --git a/src/file/homefile/userhomefile/meson.build b/src/file/homefile/userhomefile/meson.build index a114a1a..f10be0b 100644 --- a/src/file/homefile/userhomefile/meson.build +++ b/src/file/homefile/userhomefile/meson.build @@ -1 +1 @@ -modules += files('userhomeshellrcfile.cil') +modules += files('shellrcfile.cil') diff --git a/src/file/homefile/userhomefile/shellrcfile.cil b/src/file/homefile/userhomefile/shellrcfile.cil new file mode 100644 index 0000000..a620ccf --- /dev/null +++ b/src/file/homefile/userhomefile/shellrcfile.cil @@ -0,0 +1,17 @@ +(block shellrc + (block user + (block home + (blockinherit .file.home.user.template) + (filecon "HOME_DIR/\.bashrc" file file_context) + (filecon "HOME_DIR/\.bashrc" symlink file_context) + (filecon "HOME_DIR/\.bash_profile" file file_context) + (filecon "HOME_DIR/\.bash_profile" symlink file_context) + (filecon "HOME_DIR/\.bash_logout" file file_context) + (filecon "HOME_DIR/\.bash_logout" symlink file_context) + (filecon "HOME_DIR/\.zshrc" file file_context) + (filecon "HOME_DIR/\.zshrc" symlink file_context) + (filecon "HOME_DIR/\.zprofile" file file_context) + (filecon "HOME_DIR/\.zprofile" symlink file_context) + (filecon "HOME_DIR/\.zenv" file file_context) + (filecon "HOME_DIR/\.zenv" symlink file_context)))) + diff --git a/src/file/homefile/userhomefile/userhomeshellrcfile.cil b/src/file/homefile/userhomefile/userhomeshellrcfile.cil deleted file mode 100644 index a620ccf..0000000 --- a/src/file/homefile/userhomefile/userhomeshellrcfile.cil +++ /dev/null @@ -1,17 +0,0 @@ -(block shellrc - (block user - (block home - (blockinherit .file.home.user.template) - (filecon "HOME_DIR/\.bashrc" file file_context) - (filecon "HOME_DIR/\.bashrc" symlink file_context) - (filecon "HOME_DIR/\.bash_profile" file file_context) - (filecon "HOME_DIR/\.bash_profile" symlink file_context) - (filecon "HOME_DIR/\.bash_logout" file file_context) - (filecon "HOME_DIR/\.bash_logout" symlink file_context) - (filecon "HOME_DIR/\.zshrc" file file_context) - (filecon "HOME_DIR/\.zshrc" symlink file_context) - (filecon "HOME_DIR/\.zprofile" file file_context) - (filecon "HOME_DIR/\.zprofile" symlink file_context) - (filecon "HOME_DIR/\.zenv" file file_context) - (filecon "HOME_DIR/\.zenv" symlink file_context)))) - -- cgit v1.2.3