Everbrent/cis
8
0
Fork 0
mirror of https://github.com/m8tin/cis.git synced 2026-06-02 14:56:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

Improved base.module.sh including a fix of CIS[GENERICMONITORCHECKS]

Browse Source
This commit is contained in:
m8in
2026-05-15 20:08:58 +02:00
parent 5cce6efd30
commit 272ebbaf9d
1 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/base.module.sh
+20 -10
View File
@@ -66,15 +66,25 @@ function prepare.setCIS() {
&& base.abort "Array CIS was not initialized correctly." && base.abort "Array CIS was not initialized correctly."
# Retrieves the variables for this module using 'BASH_SOURCE[0]', the infos about the script using '$0'. # Retrieves the variables for this module using 'BASH_SOURCE[0]', the infos about the script using '$0'.
local _CISROOT _FULLBASENAME _FULLSCRIPTNAME local _ROOT_TRUNK _FULLBASENAME _FULLSCRIPTNAME
_FULLBASENAME=$(readlink -e "${BASH_SOURCE[0]}" 2> /dev/null) _FULLBASENAME=$(realpath "${BASH_SOURCE[0]}" 2> /dev/null)
_FULLSCRIPTNAME=$(readlink -e "${0}" 2> /dev/null) _FULLSCRIPTNAME=$(realpath "${0}" 2> /dev/null)
_CISROOT=$(echo "${_FULLSCRIPTNAME}" | grep -o '^.*/cis/')
readonly _CISROOT _FULLBASENAME _FULLSCRIPTNAME _ROOT_TRUNK="${_FULLSCRIPTNAME%cis/*}"
while [ ! -d "${_ROOT_TRUNK}cis/core/" ]; do
[ "${_ROOT_TRUNK}" == "${0}" ] \
&& base.abort ' Unable to find root folder of CIS!' 'It seams the script does not belong to CIS.'
[ "${_ROOT_TRUNK}" == "/" ] \
&& base.abort ' Unable to find root folder of CIS!' 'This state was reached unexpected.'
_ROOT_TRUNK="${_ROOT_TRUNK%cis/*}"
done
readonly _ROOT_TRUNK _FULLBASENAME _FULLSCRIPTNAME
# Folders always ends with an tailing '/' # Folders always ends with an tailing '/'
CIS[ROOT]="${_CISROOT:?"Missing CISROOT"}" CIS[ROOT]="${_ROOT_TRUNK:?"Missing ROOT_TRUNK"}cis/"
CIS[COREROOT]="${CIS[ROOT]}core/" CIS[COREROOT]="${CIS[ROOT]:?"Missing ROOT"}core/"
CIS[SCRIPTSROOT]="${CIS[ROOT]}script/" CIS[SCRIPTSROOT]="${CIS[ROOT]}script/"
CIS[DOMAIN]=$(base.printOwnDomain "${CIS[ROOT]}") CIS[DOMAIN]=$(base.printOwnDomain "${CIS[ROOT]}")
CIS[MODULEDIR]="${CIS[ROOT]}module/" CIS[MODULEDIR]="${CIS[ROOT]}module/"
@@ -106,11 +116,11 @@ function prepare.setCIS() {
CIS[SCRIPTNAME]="${CIS[FULLSCRIPTNAME]##*/}" CIS[SCRIPTNAME]="${CIS[FULLSCRIPTNAME]##*/}"
CIS[DEFAULTDEFINITIONS]="${CIS[ROOT]}definitions/default/" CIS[DEFAULTDEFINITIONS]="${CIS[ROOT]}definitions/default/"
CIS[DOMAINDEFINITIONS]="${CIS[ROOT]}definitions/${CIS[DOMAIN]}/" CIS[DOMAINDEFINITIONS]="${CIS[ROOT]}definitions/${CIS[DOMAIN]:?"Missing DOMAIN"}/"
CIS[DOMAINSTATES]="${CIS[ROOT]}states/${CIS[DOMAIN]}/" CIS[DOMAINSTATES]="${CIS[ROOT]}states/${CIS[DOMAIN]}/"
CIS[COMPOSITIONS]="${CIS[DOMAINDEFINITIONS]:?"Missing DOMAINDEFINITIONS"}compositions/" CIS[COMPOSITIONS]="${CIS[DOMAINDEFINITIONS]:?"Missing DOMAINDEFINITIONS"}compositions/"
CIS[GENERICMONITORCHECKS]="${CIS[SCRIPTDIR]:?"Missing SCRIPTDIR"}monitor/generic/" CIS[GENERICMONITORCHECKS]="${CIS[SCRIPTSROOT]:?"Missing SCRIPTROOT"}monitor/generic/"
CIS[SET]="normal" CIS[SET]="normal"
# Sets the write protection of array 'CIS' # Sets the write protection of array 'CIS'
@@ -168,7 +178,7 @@ function base.abort() {
&& printf " %b\n\n" "${@}" >&2 \ && printf " %b\n\n" "${@}" >&2 \
&& exit 1 && exit 1
local _FULLSCRIPTNAME=$(readlink -e "${0}" 2> /dev/null) local _FULLSCRIPTNAME=$(realpath "${0}" 2> /dev/null)
local _SCRIPTNAME="${_FULLSCRIPTNAME##*/}" local _SCRIPTNAME="${_FULLSCRIPTNAME##*/}"
[ "${1:+isset}" != "isset" ] \ [ "${1:+isset}" != "isset" ] \