diff --git a/modules/01-system-settings.sh b/modules/01-system-settings.sh index 48a626d..f67672a 100755 --- a/modules/01-system-settings.sh +++ b/modules/01-system-settings.sh @@ -43,7 +43,6 @@ function setComputerName() { function configureComputerHostname() { local currentComputerName="`scutil --get ComputerName`" - lop -y h1 -- -i 'Configure Computer Hostname' if [[ "${currentComputerName}" != "${hostname}" ]]; then lop -- -i 'Hostname of computer has not been set.' -i "Will set to ${hostname}." indicateActivity -- setComputerName 'Setting computer name' @@ -103,6 +102,7 @@ function configureLoginWindow() { } function configure_system() { + lop -y h1 -- -i 'Configure System Settings' quitSystemPreferences configureComputerHostname configureBasicSystem diff --git a/modules/02-create-filevault-user.sh b/modules/02-create-filevault-user.sh index 6624607..152161f 100755 --- a/modules/02-create-filevault-user.sh +++ b/modules/02-create-filevault-user.sh @@ -175,6 +175,7 @@ function allowOnlyFileVaultUserToUnlock() { } function configure_system() { + lop -y h1 -- -i 'Setup FileVault System' checkSecureTokenForUser "${secure_token_user_username}" || { lop -- -e 'The provided secure token user has no secure token.'; return 10 } checkSecureTokenUserPassword || { lop -- -e 'The secure token user password is incorrect.'; return 11 } convertPathToDefaultPicture diff --git a/modules/03-install-brew.sh b/modules/03-install-brew.sh index f07ae17..a63286b 100755 --- a/modules/03-install-brew.sh +++ b/modules/03-install-brew.sh @@ -231,6 +231,7 @@ function tapHomebrewCaskFonts() { } function configure_system() { + lop -y h1 -- -i 'Install System Homebrew' createHomebrewUserIfNeccessary || return 10 indicateActivity ensureUserIsInAdminGroup,${homebrew_username} 'Ensure Homebrew user is in admin group' || return 11 indicateActivity ensureUserCannotRunSudo,${homebrew_username} 'Ensure Homebrew user can not run sudo' || return 12 diff --git a/modules/04-install-brew-apps.sh b/modules/04-install-brew-apps.sh index d855a23..f062e4a 100755 --- a/modules/04-install-brew-apps.sh +++ b/modules/04-install-brew-apps.sh @@ -88,6 +88,7 @@ function installBrews() { } function configure_system() { + lop -y h1 -- -i 'Install Homebrew Applications' pushd -q / installBrews installCasks diff --git a/modules/05-install-remap-keys.sh b/modules/05-install-remap-keys.sh index 951b9ae..c12f100 100755 --- a/modules/05-install-remap-keys.sh +++ b/modules/05-install-remap-keys.sh @@ -91,6 +91,7 @@ function enableLaunchDaemon() { } function configure_system() { + lop -y h1 -- -i 'Configure Microsoft Keyremapper' local serviceName='de.astzweig.macos.launchdaemons.keymapper' local dstDir='/usr/local/bin' local xpcConsumerPath="${dstDir}/astzweig-xpc-consumer" diff --git a/modules/06-install-mas-apps.sh b/modules/06-install-mas-apps.sh index bbe4100..15d8f33 100755 --- a/modules/06-install-mas-apps.sh +++ b/modules/06-install-mas-apps.sh @@ -9,6 +9,7 @@ function installMASApp() { } function configure_system() { + lop -y h1 -- -i 'Install Mac AppStore Apps' installMASApp Keka 470158793 if ! isDebug; then diff --git a/modules/07-install-binaries.sh b/modules/07-install-binaries.sh index 34fb7e9..f786992 100755 --- a/modules/07-install-binaries.sh +++ b/modules/07-install-binaries.sh @@ -8,7 +8,6 @@ function ensureRightAccess() { } function copyUtilityBinaries() { - lop -y h1 -- -i 'Installing utility binaries' for file in ${_DIR}/../bin/*; do indicateActivity cp,${file},${dstDir} "Copying ${file##*/}" ensureRightAccess ${file} @@ -24,6 +23,7 @@ function installDocopts() { } function configure_system() { + lop -y h1 -- -i 'Install Utility Binaries' local dstDir='/usr/local/bin' ensurePathOrLogError ${dstDir} 'Could not install binaries.' || return 10 installDocopts diff --git a/modules/08-install-zsh-libraries.sh b/modules/08-install-zsh-libraries.sh index 16d07ee..93571aa 100755 --- a/modules/08-install-zsh-libraries.sh +++ b/modules/08-install-zsh-libraries.sh @@ -21,6 +21,7 @@ function modifyGlobalFpath() { } function configure_system() { + lop -y h1 -- -i 'Install ZSh Libraries' local libDir=/usr/local/share/zsh/site-functions local libs=() ensurePathOrLogError ${libDir} 'Could not install zsh libraries.' || return 10