Fix syntax and naming error

This commit is contained in:
T. R. Bernstein
2024-06-28 20:23:54 +02:00
committed by T. R. Bernstein
parent 99236a577b
commit 6461d6143f
2 changed files with 5 additions and 6 deletions

View File

@@ -11,7 +11,7 @@ function majorMinor() {
function shouldInstallCommandLineTools() { function shouldInstallCommandLineTools() {
local macosVersion=$(majorMinor $(/usr/bin/sw_vers -productVersion)) local macosVersion=$(majorMinor $(/usr/bin/sw_vers -productVersion))
if version_gt "${macosVersion}" "10.13" if versionGT "${macosVersion}" "10.13"
then then
! [[ -e "/Library/Developer/CommandLineTools/usr/bin/git" ]] ! [[ -e "/Library/Developer/CommandLineTools/usr/bin/git" ]]
else else

View File

@@ -51,7 +51,7 @@ function createLaunchDaemon() {
<string>${serviceName}</string> <string>${serviceName}</string>
<key>ProgramArguments</key> <key>ProgramArguments</key>
<array> <array>
<string>${$binaryPath}</string> <string>${binaryPath}</string>
<string>${filevault_username}</string> <string>${filevault_username}</string>
</array> </array>
<key>OnDemand</key> <key>OnDemand</key>
@@ -61,9 +61,8 @@ function createLaunchDaemon() {
</dict> </dict>
</plist> </plist>
LDAEMON LDAEMON
ensureRightAccess ${launchDaemonPath} chown root:wheel $launchDaemonPath
chown root:wheel $binaryPath chmod ugo=r $launchDaemonPath
chmod ugo=r $binaryPath
} }
function enableLaunchDaemon() { function enableLaunchDaemon() {
@@ -80,7 +79,7 @@ function createLaunchdService() {
function configure_system() { function configure_system() {
lop -y h1 -- -i 'Allow only Filevault user to unlock disk' 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 indicateActivity -- 'Create ensurer binary' createEnsurerBinary
createLaunchdService createLaunchdService
} }