Everbrent/cis
9
0
Fork 0
mirror of https://github.com/m8tin/cis.git synced 2025-12-06 15:58:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Refactoring

Browse Source
This commit is contained in:
Martin Berghaus
2025-03-22 19:45:15 +01:00
parent 106720ebd7
commit b0c49c3779
6 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/addAndCheckGitRepository.sh
View File

@@ -75,11 +75,11 @@ function printRepository(){
# Note that an unprivileged user can use this script successfully, # Note that an unprivileged user can use this script successfully,
# if no user has to be added to the host because it already exists. # if no user has to be added to the host because it already exists.
function addAndCheckGitRepository() { function addAndCheckGitRepository() {
local _FOLDER _REPOSITORY local _FOLDER _REPOSITORY _RIGHTS
_FOLDER="${1:?"Missing first parameter FOLDER"}" _FOLDER="${1:?"Missing first parameter FOLDER"}"
_REPOSITORY="$(printRepository "${_FOLDER}" "${2}")" _RIGHTS="${2:?"Missing third parameter RIGHTS: (readonly, writable) "}"
_RIGHTS="${3:?"Missing third parameter RIGHTS: (readonly, writable) "}" _REPOSITORY="$(printRepository "${_FOLDER}" "${3}")"
readonly _FOLDER _REPOSITORY readonly _FOLDER _REPOSITORY _RIGHTS
echo \ echo \
&& cloneOrPull "${_FOLDER}" "${_REPOSITORY:?"Missing REPOSITORY: e.g. ssh://git@your.domain.com/cis.git"}" \ && cloneOrPull "${_FOLDER}" "${_REPOSITORY:?"Missing REPOSITORY: e.g. ssh://git@your.domain.com/cis.git"}" \

6
core/addNormalUser.sh
View File

@@ -29,9 +29,9 @@ function addNormalUser() {
&& echo " - existing home directories were taken over" \ && echo " - existing home directories were taken over" \
&& return 0 && return 0
echo "FAIL: The user could not be created: ("$(readlink -f ${0})")" echo "FAIL: The user could not be created: ("$(readlink -f ${0})")" >&2
echo " - '${_USER}'" echo " - '${_USER}'" >&2
echo " - due to an error or insufficient rights." echo " - due to an error or insufficient rights." >&2
return 1 return 1
} }

6
core/addToCrontabEveryHour.sh
View File

@@ -41,9 +41,9 @@ function addToCrontabEveryHour() {
&& echo " - '${_STRING}'" \ && echo " - '${_STRING}'" \
&& return 0 && return 0
echo "FAIL: Entry could not be registered to crontab: ("$(readlink -f ${0})")" echo "FAIL: Entry could not be registered to crontab: ("$(readlink -f ${0})")" >&2
echo " - '${_STRING:?"Missing CRON_STRING"}'" echo " - '${_STRING:?"Missing CRON_STRING"}'" >&2
echo " - due to an error or insufficient rights." echo " - due to an error or insufficient rights." >&2
return 1 return 1
} }

6
core/defineAuthorizedKeysOfUser.sh
View File

@@ -44,9 +44,9 @@ function prepareFolder() {
&& echo " - '${_SSH_FOLDER}'" \ && echo " - '${_SSH_FOLDER}'" \
&& return 0 && return 0
echo "FAIL: The ssh folder could not be prepared: ("$(readlink -f ${0})")" echo "FAIL: The ssh folder could not be prepared: ("$(readlink -f ${0})")" >&2
echo " - '${_SSH_FOLDER}'" echo " - '${_SSH_FOLDER}'" >&2
echo " - due to an error or insufficient rights." echo " - due to an error or insufficient rights." >&2
return 1 return 1
} }

4
core/ensureUsageOfDefinitions.sh
View File

@@ -196,8 +196,8 @@ function ensureUsageOfDefinitions() {
&& echo "- '${_DEFINED_FULLFILE}'" \ && echo "- '${_DEFINED_FULLFILE}'" \
&& return 0 && return 0
echo "FAIL: The definition could not be ensured: ("$(readlink -f ${0})")" echo "FAIL: The definition could not be ensured: ("$(readlink -f ${0})")" >&2
echo " - due to an error or insufficient rights." echo " - due to an error or insufficient rights." >&2
return 1 return 1
} }

12
setupCoreOntoThisHost.sh
View File

@@ -126,13 +126,13 @@ function addDefinition(){
[ "$(id -u)" == "0" ] \ [ "$(id -u)" == "0" ] \
&& echo "Running setup as 'root' trying to add definition repository:" \ && echo "Running setup as 'root' trying to add definition repository:" \
&& "${_CORE_SCRIPTS:?"Missing CORE_SCRIPTS"}addAndCheckGitRepository.sh" "${_DEFINITIONS}" "${_REPOSITORY}" readonly \ && "${_CORE_SCRIPTS:?"Missing CORE_SCRIPTS"}addAndCheckGitRepository.sh" "${_DEFINITIONS}" readonly "${_REPOSITORY}" \
&& echo " - definitions are usable for this host." \ && echo " - definitions are usable for this host." \
&& return 0 && return 0
[ "$(id -u)" != "0" ] \ [ "$(id -u)" != "0" ] \
&& echo "Running setup as 'user' trying to add definition repository:" \ && echo "Running setup as 'user' trying to add definition repository:" \
&& "${_CORE_SCRIPTS:?"Missing CORE_SCRIPTS"}addAndCheckGitRepository.sh" "${_DEFINITIONS}" "${_REPOSITORY}" writable \ && "${_CORE_SCRIPTS:?"Missing CORE_SCRIPTS"}addAndCheckGitRepository.sh" "${_DEFINITIONS}" writable "${_REPOSITORY}" \
&& echo " - definitions are usable, as working copy." \ && echo " - definitions are usable, as working copy." \
&& return 0 && return 0
@@ -148,14 +148,14 @@ function addState() {
[ "$(id -u)" == "0" ] \ [ "$(id -u)" == "0" ] \
&& echo "Running setup as 'root' trying to add state repository:" \ && echo "Running setup as 'root' trying to add state repository:" \
&& echo \ && echo \
&& "${_CORE_SCRIPTS:?"Missing CORE_SCRIPTS"}addAndCheckGitRepository.sh" "${_STATES}" "${_REPOSITORY}" writable \ && "${_CORE_SCRIPTS:?"Missing CORE_SCRIPTS"}addAndCheckGitRepository.sh" "${_STATES}" writable "${_REPOSITORY}" \
&& echo " - states are usable for this host." \ && echo " - states are usable for this host." \
&& return 0 && return 0
[ "$(id -u)" != "0" ] \ [ "$(id -u)" != "0" ] \
&& echo "Running setup as 'user' trying to add state repository:" \ && echo "Running setup as 'user' trying to add state repository:" \
&& echo \ && echo \
&& "${_CORE_SCRIPTS:?"Missing CORE_SCRIPTS"}addAndCheckGitRepository.sh" "${_STATES}" "${_REPOSITORY}" writable \ && "${_CORE_SCRIPTS:?"Missing CORE_SCRIPTS"}addAndCheckGitRepository.sh" "${_STATES}" writable "${_REPOSITORY}" \
&& echo " - states are usable, as working copy." \ && echo " - states are usable, as working copy." \
&& return 0 && return 0
@@ -208,8 +208,8 @@ function setup() {
&& setupCoreFunctionality "${_DEFINITIONS:?"Missing DEFINITIONS"}" \ && setupCoreFunctionality "${_DEFINITIONS:?"Missing DEFINITIONS"}" \
&& return 0 && return 0
echo "FAIL: setup is incomplete: ("$(readlink -f ${0})")" echo "FAIL: setup is incomplete: ("$(readlink -f ${0})")" >&2
echo " - due to an error or insufficient rights." echo " - due to an error or insufficient rights." >&2
return 1 return 1
} }