Everbrent/cis
8
0
Fork 0
mirror of https://github.com/m8tin/cis.git synced 2026-08-01 11:47:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

Use of base.set() parameter optional and remove exit 1, because is is obsolete.

Browse Source
This commit is contained in:
m8in
2026-06-15 21:52:57 +02:00
parent 3976a656c6
commit a5aa2d8833
15 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/addAndCheckGitRepository.sh
+3 -3
View File
@@ -99,9 +99,9 @@ function addAndCheckGitRepository() {
}
# sanitizes all parameters
base.set FOLDER "${1}" '^[-a-zA-Z0-9/:@._]*/$' || exit 1
base.set RIGHTS "${2}" '^(readonly|writable)$' || exit 1
base.set SUGGESTED_REPOSITORY "${3}" '^([-a-zA-Z0-9/:@._]*)?$' || exit 1
base.set FOLDER "${1}" '^[-a-zA-Z0-9/:@._]*/$'
base.set RIGHTS "${2}" '^(readonly|writable)$'
base.set SUGGESTED_REPOSITORY "${3}" '^[-a-zA-Z0-9/:@._]*$' optional
addAndCheckGitRepository \
"${FOLDER:?"Missing FOLDER"}" \
"${RIGHTS:?"Missing RIGHTS"}" \
core/addNormalUser.sh
+1 -1
View File
@@ -37,7 +37,7 @@ function addNormalUser() {
}
# sanitizes all parameters
base.set USER "${1}" '^[a-z][-a-z0-9_.]*$' || exit 1
base.set USER "${1}" '^[a-z][-a-z0-9_.]*$'
addNormalUser "${USER:?"Missing USER"}" \
&& exit 0
core/addToCrontabEveryHour.sh
+2 -2
View File
@@ -44,8 +44,8 @@ function addToCrontabEveryHour() {
}
# sanitizes all parameters
base.set COMMAND "${1}" '^[-a-zA-Z0-9/:@._]*$' || exit 1
base.set MINUTE_VALUE "${2}" '^[-a-zA-Z0-9/:@._]*$' || exit 1
base.set COMMAND "${1}" '^[-a-zA-Z0-9/:@._]*$'
base.set MINUTE_VALUE "${2}" '^[-a-zA-Z0-9/:@._]*$'
addToCrontabEveryHour \
"${COMMAND:?"Missing COMMAND"}" \
"${MINUTE_VALUE:?"Missing MINUTE_VALUE"}" \
core/base.module.sh
+1 -1
View File
@@ -290,7 +290,7 @@ function base.loadModule() {
function base.log() {
local _LOGLEVEL _LOGLEVEL_UPPER
base.set _LOGLEVEL "${1}" '^(error|warn|info|debug)$' || exit 1
base.set _LOGLEVEL "${1}" '^(error|warn|info|debug)$'
_LOGLEVEL_UPPER="${_LOGLEVEL:?"base.log(): Missing valid first parameter LOGLEVEL"}"
_LOGLEVEL_UPPER="${_LOGLEVEL_UPPER^^}"
readonly _LOGLEVEL_UPPER
core/defineAuthorizedKeysOfUser.sh
+2 -2
View File
@@ -136,8 +136,8 @@ function defineAuthorizedKeysOfUser() {
}
# sanitizes all parameters
base.set DEFINITIONS "${1}" '^[-a-zA-Z0-9/:@._]*$' || exit 1
base.set USER "${2}" '^[-a-zA-Z0-9/:@._]*$' || exit 1
base.set DEFINITIONS "${1}" '^[-a-zA-Z0-9/:@._]*$'
base.set USER "${2}" '^[-a-zA-Z0-9/:@._]*$'
defineAuthorizedKeysOfUser \
"${DEFINITIONS:?"Missing DEFINITIONS"}" \
"${USER:?"Missing USER"}" \
core/ensureUsageOfDefinitions.sh
+2 -2
View File
@@ -218,8 +218,8 @@ function ensureUsageOfDefinitions() {
}
# sanitizes all parameters
base.set DEFINITIONS "${1}" '^[-a-zA-Z0-9/:@._]*$' || exit 1
base.set CURRENT_FULLFILE "${2}" '^[-a-zA-Z0-9/:@._]*$' || exit 1
base.set DEFINITIONS "${1}" '^[-a-zA-Z0-9/:@._]*$'
base.set CURRENT_FULLFILE "${2}" '^[-a-zA-Z0-9/:@._]*$'
ensureUsageOfDefinitions \
"${DEFINITIONS:?"Missing DEFINITIONS"}" \
"${CURRENT_FULLFILE:?"Missing CURRENT_FULLFILE"}" \