diff --git a/script/check/host/all/core_pam_lib_google-authenticator_is_installed.check.sh b/script/check/host/all/core_pam_lib_google-authenticator_is_installed.check.sh new file mode 100755 index 0000000..37fc035 --- /dev/null +++ b/script/check/host/all/core_pam_lib_google-authenticator_is_installed.check.sh @@ -0,0 +1,8 @@ +#!/bin/bash + +_PKG_NAME='libpam-google-authenticator' + +dpkg -l | grep -q -F "${_PKG_NAME}" 2> /dev/null \ + && exit 0 + +exit 1 diff --git a/script/check/host/all/core_pam_lib_pwquality_is_installed.check.sh b/script/check/host/all/core_pam_lib_pwquality_is_installed.check.sh new file mode 100755 index 0000000..460f1d8 --- /dev/null +++ b/script/check/host/all/core_pam_lib_pwquality_is_installed.check.sh @@ -0,0 +1,8 @@ +#!/bin/bash + +_PKG_NAME='libpam-pwquality' + +dpkg -l | grep -q -F "${_PKG_NAME}" 2> /dev/null \ + && exit 0 + +exit 1 diff --git a/setupCoreOntoThisHost.sh b/setupCoreOntoThisHost.sh index 8244691..81773f0 100755 --- a/setupCoreOntoThisHost.sh +++ b/setupCoreOntoThisHost.sh @@ -127,7 +127,6 @@ function addDefinition(){ [ "$(id -u)" == "0" ] \ && echo \ && echo "Running setup as 'root' trying to add definition repository:" \ - && echo \ && "${_CORE_SCRIPTS:?"Missing CORE_SCRIPTS"}addAndCheckGitRepository.sh" "${_DEFINITIONS}" readonly "${_REPOSITORY}" \ && echo " - definitions are usable for this host." \ && return 0 @@ -135,7 +134,6 @@ function addDefinition(){ [ "$(id -u)" != "0" ] \ && echo \ && echo "Running setup as 'user' trying to add definition repository:" \ - && echo \ && "${_CORE_SCRIPTS:?"Missing CORE_SCRIPTS"}addAndCheckGitRepository.sh" "${_DEFINITIONS}" writable "${_REPOSITORY}" \ && echo " - definitions are usable, as working copy." \ && return 0 @@ -152,7 +150,6 @@ function addState() { [ "$(id -u)" == "0" ] \ && echo \ && echo "Running setup as 'root' trying to add state repository:" \ - && echo \ && "${_CORE_SCRIPTS:?"Missing CORE_SCRIPTS"}addAndCheckGitRepository.sh" "${_STATES}" writable "${_REPOSITORY}" \ && echo " - states are usable for this host." \ && return 0 @@ -160,7 +157,6 @@ function addState() { [ "$(id -u)" != "0" ] \ && echo \ && echo "Running setup as 'user' trying to add state repository:" \ - && echo \ && "${_CORE_SCRIPTS:?"Missing CORE_SCRIPTS"}addAndCheckGitRepository.sh" "${_STATES}" writable "${_REPOSITORY}" \ && echo " - states are usable, as working copy." \ && return 0