diff --git a/bootstrap.sh b/bootstrap.sh index aeb873e..4d03f28 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -11,7 +11,7 @@ function majorMinor() { function shouldInstallCommandLineTools() { local macosVersion=$(majorMinor $(/usr/bin/sw_vers -productVersion)) - if version_gt "${macosVersion}" "10.13" + if versionGT "${macosVersion}" "10.13" then ! [[ -e "/Library/Developer/CommandLineTools/usr/bin/git" ]] else diff --git a/modules/02-single-filevault-user.sh b/modules/02-single-filevault-user.sh index 5148e2c..1d50c44 100755 --- a/modules/02-single-filevault-user.sh +++ b/modules/02-single-filevault-user.sh @@ -51,7 +51,7 @@ function createLaunchDaemon() { ${serviceName} ProgramArguments - ${$binaryPath} + ${binaryPath} ${filevault_username} OnDemand @@ -61,9 +61,8 @@ function createLaunchDaemon() { LDAEMON - ensureRightAccess ${launchDaemonPath} - chown root:wheel $binaryPath - chmod ugo=r $binaryPath + chown root:wheel $launchDaemonPath + chmod ugo=r $launchDaemonPath } function enableLaunchDaemon() { @@ -80,7 +79,7 @@ function createLaunchdService() { function configure_system() { lop -y h1 -- -i 'Allow only Filevault user to unlock disk' - local binaryPath = '/usr/local/bin/ensure-single-filevault-user' + local binaryPath='/usr/local/bin/ensure-single-filevault-user' indicateActivity -- 'Create ensurer binary' createEnsurerBinary createLaunchdService }