From b6ccc90bee67aa7514fa1936ee9b872c3f07959a Mon Sep 17 00:00:00 2001 From: "T. R. Bernstein" <137705289+trbernstein@users.noreply.github.com> Date: Sun, 30 Jun 2024 23:22:25 +0200 Subject: [PATCH] Create host-specific modules --- install.sh | 5 ++++- modules/{ => host-specific}/01-set-hostname.sh | 0 modules/{ => host-specific}/02-create-filevault-user.sh | 0 3 files changed, 4 insertions(+), 1 deletion(-) rename modules/{ => host-specific}/01-set-hostname.sh (100%) mode change 100644 => 100755 rename modules/{ => host-specific}/02-create-filevault-user.sh (100%) diff --git a/install.sh b/install.sh index eb9aaa5..6c35a7b 100755 --- a/install.sh +++ b/install.sh @@ -114,6 +114,8 @@ function main() { -l, --list List modules that are going to be installed and exit without installation. Modules are printed in 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. -v, --verbose Be more verbose. --config-only PATH Ask module questions, generate config at PATH and @@ -132,7 +134,8 @@ function main() { [[ -n ${noninteractive} && -z ${config} ]] && { lop -- -e 'A config file must be provided in noninteractive mode.'; return 10 } - modpath+=("${_DIR}/modules") + [[ ${host_specific_only} == 'false' ]] && modpath+=("${_DIR}/modules") + [[ ${host_specific} == 'true' || ${host_specific_only} == 'true' ]] && modpath+=("${_DIR}/modules/host-specific") loadModules -v modulesToInstall ${$(echo -m):^^modpath} "${module[@]}" [ "${list}" = true ] && printModulesToInstall diff --git a/modules/01-set-hostname.sh b/modules/host-specific/01-set-hostname.sh old mode 100644 new mode 100755 similarity index 100% rename from modules/01-set-hostname.sh rename to modules/host-specific/01-set-hostname.sh diff --git a/modules/02-create-filevault-user.sh b/modules/host-specific/02-create-filevault-user.sh similarity index 100% rename from modules/02-create-filevault-user.sh rename to modules/host-specific/02-create-filevault-user.sh