Remove host specific settings
We've moved them to individual binaries.
This commit is contained in:
@@ -114,8 +114,6 @@ function main() {
|
|||||||
-l, --list List modules that are going to be installed and
|
-l, --list List modules that are going to be installed and
|
||||||
exit without installation. Modules are printed in
|
exit without installation. Modules are printed in
|
||||||
minimal but still distinct paths.
|
minimal but still distinct paths.
|
||||||
--host-specific Include host-specific default modules.
|
|
||||||
--host-specific-only Include only host-specific default modules.
|
|
||||||
-d FILE, --logfile FILE Print log message to logfile instead of stdout.
|
-d FILE, --logfile FILE Print log message to logfile instead of stdout.
|
||||||
-v, --verbose Be more verbose.
|
-v, --verbose Be more verbose.
|
||||||
--config-only PATH Ask module questions, generate config at PATH and
|
--config-only PATH Ask module questions, generate config at PATH and
|
||||||
@@ -132,8 +130,7 @@ function main() {
|
|||||||
lop -- -d "Current working dir is: `pwd`"
|
lop -- -d "Current working dir is: `pwd`"
|
||||||
lop -- -d "Called main with $# args: $*"
|
lop -- -d "Called main with $# args: $*"
|
||||||
|
|
||||||
[[ ${host_specific_only} == 'false' ]] && modpath+=("${_DIR}/modules")
|
modpath+=("${_DIR}/modules")
|
||||||
[[ ${host_specific} == 'true' || ${host_specific_only} == 'true' ]] && modpath+=("${_DIR}/modules/host-specific")
|
|
||||||
{ [[ ${inverse} == true ]] && inverse=-i } || inverse=
|
{ [[ ${inverse} == true ]] && inverse=-i } || inverse=
|
||||||
loadModules -v modulesToInstall ${$(echo -m):^^modpath} ${inverse} "${module[@]}"
|
loadModules -v modulesToInstall ${$(echo -m):^^modpath} ${inverse} "${module[@]}"
|
||||||
[ "${list}" = true ] && printModulesToInstall
|
[ "${list}" = true ] && printModulesToInstall
|
||||||
|
|||||||
@@ -1,47 +0,0 @@
|
|||||||
#!/usr/bin/env zsh
|
|
||||||
# vi: ft=zsh
|
|
||||||
|
|
||||||
function getExecPrerequisites() {
|
|
||||||
cmds=(
|
|
||||||
[azw]=''
|
|
||||||
[azw-set-hostname]=''
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
function getQuestions() {
|
|
||||||
questions=(
|
|
||||||
'i: hostname=What shall the hostname of this host be?'
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
function configure_system() {
|
|
||||||
lop -y h1 -- -i 'Configure System Hostname'
|
|
||||||
azw set-hostname --hostname ${hostname}
|
|
||||||
}
|
|
||||||
|
|
||||||
function getUsage() {
|
|
||||||
local cmdName=$1 text=''
|
|
||||||
read -r -d '' text <<- USAGE
|
|
||||||
Usage:
|
|
||||||
$cmdName show-questions [<modkey> <modans>]...
|
|
||||||
$cmdName [-v] [-d FILE] --hostname NAME
|
|
||||||
|
|
||||||
Configure hostname.
|
|
||||||
|
|
||||||
Options:
|
|
||||||
--hostname NAME Set NAME as current host's host name.
|
|
||||||
-d FILE, --logfile FILE Print log message to logfile instead of stdout.
|
|
||||||
-v, --verbose Be more verbose.
|
|
||||||
----
|
|
||||||
$cmdName 0.1.0
|
|
||||||
Copyright (C) 2022 Rezart Qelibari, Astzweig GmbH & Co. KG
|
|
||||||
License EUPL-1.2. There is NO WARRANTY, to the extent permitted by law.
|
|
||||||
USAGE
|
|
||||||
print -- ${text}
|
|
||||||
}
|
|
||||||
|
|
||||||
if [[ "${ZSH_EVAL_CONTEXT}" == toplevel ]]; then
|
|
||||||
test -f "${ASTZWEIG_MACOS_SYSTEM_LIB}" || { echo 'This module requires macos-system library. Please run again with macos-system library provieded as a path in ASTZWEIG_MACOS_SYSTEM_LIB env variable.'; return 10 }
|
|
||||||
source "${ASTZWEIG_MACOS_SYSTEM_LIB}"
|
|
||||||
module_main $0 "$@"
|
|
||||||
fi
|
|
||||||
@@ -1,59 +0,0 @@
|
|||||||
#!/usr/bin/env zsh
|
|
||||||
# vi: ft=zsh
|
|
||||||
|
|
||||||
function getQuestionsPrerequisites() {
|
|
||||||
cmds=(
|
|
||||||
[systemsetup]=''
|
|
||||||
)
|
|
||||||
requireRootPrivileges
|
|
||||||
}
|
|
||||||
|
|
||||||
function getExecPrerequisites() {
|
|
||||||
cmds=(
|
|
||||||
[systemsetup]=''
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
function getQuestions() {
|
|
||||||
local timezones
|
|
||||||
timezones="`systemsetup -listtimezones | tail -n +2 | awk '{print $1}' | paste -sd, -`"
|
|
||||||
questions=(
|
|
||||||
's: timezone=What shall the timezone of this host be? # choose from:'"${timezones};"
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
function configureTimezone(){
|
|
||||||
systemsetup -settimezone "${timezone}" >&! /dev/null
|
|
||||||
}
|
|
||||||
|
|
||||||
function configure_system() {
|
|
||||||
lop -y h1 -- -i 'Configure System Timezone'
|
|
||||||
indicateActivity -- 'Configuring timezone' configureTimezone
|
|
||||||
}
|
|
||||||
|
|
||||||
function getUsage() {
|
|
||||||
local cmdName=$1 text=''
|
|
||||||
read -r -d '' text <<- USAGE
|
|
||||||
Usage:
|
|
||||||
$cmdName show-questions [<modkey> <modans>]...
|
|
||||||
$cmdName [-v] [-d FILE] --hostname NAME --timezone ZONE
|
|
||||||
|
|
||||||
Configure system timezone.
|
|
||||||
|
|
||||||
Options:
|
|
||||||
--timezone ZONE Set ZONE as current host's timezone [default: Europe/Berlin].
|
|
||||||
-d FILE, --logfile FILE Print log message to logfile instead of stdout.
|
|
||||||
-v, --verbose Be more verbose.
|
|
||||||
----
|
|
||||||
$cmdName 0.1.0
|
|
||||||
Copyright (C) 2022 Rezart Qelibari, Astzweig GmbH & Co. KG
|
|
||||||
License EUPL-1.2. There is NO WARRANTY, to the extent permitted by law.
|
|
||||||
USAGE
|
|
||||||
print -- ${text}
|
|
||||||
}
|
|
||||||
|
|
||||||
if [[ "${ZSH_EVAL_CONTEXT}" == toplevel ]]; then
|
|
||||||
test -f "${ASTZWEIG_MACOS_SYSTEM_LIB}" || { echo 'This module requires macos-system library. Please run again with macos-system library provieded as a path in ASTZWEIG_MACOS_SYSTEM_LIB env variable.'; return 10 }
|
|
||||||
source "${ASTZWEIG_MACOS_SYSTEM_LIB}"
|
|
||||||
module_main $0 "$@"
|
|
||||||
fi
|
|
||||||
Reference in New Issue
Block a user