diff --git a/home/dot_local/etc/clamav/installdoctor.clamdscan.plist.tmpl b/home/dot_local/etc/clamav/clamdscan.plist.tmpl similarity index 79% rename from home/dot_local/etc/clamav/installdoctor.clamdscan.plist.tmpl rename to home/dot_local/etc/clamav/clamdscan.plist.tmpl index 18f557a6..d3d472e4 100644 --- a/home/dot_local/etc/clamav/installdoctor.clamdscan.plist.tmpl +++ b/home/dot_local/etc/clamav/clamdscan.plist.tmpl @@ -4,7 +4,7 @@ Label - installdoctor.clamdscan + clamav.clamdscan ProgramArguments /usr/local/bin/clamdscan @@ -22,9 +22,9 @@ UserName root StandardErrorPath - /var/log/installdoctor/clamdscan.error.log + /var/log/clamav/clamdscan.error.log StandardOutPath - /var/log/installdoctor/clamdscan.output.log + /var/log/clamav/clamdscan.output.log {{- end -}} diff --git a/home/dot_local/etc/clamav/installdoctor.freshclam.plist.tmpl b/home/dot_local/etc/clamav/freshclam.plist.tmpl similarity index 80% rename from home/dot_local/etc/clamav/installdoctor.freshclam.plist.tmpl rename to home/dot_local/etc/clamav/freshclam.plist.tmpl index eb40359f..a0ac4388 100644 --- a/home/dot_local/etc/clamav/installdoctor.freshclam.plist.tmpl +++ b/home/dot_local/etc/clamav/freshclam.plist.tmpl @@ -4,7 +4,7 @@ Label - installdoctor.freshclam + clamav.freshclam ProgramArguments /usr/local/bin/freshclam @@ -22,9 +22,9 @@ UserName {{ $.chezmoi.username }} StandardErrorPath - /var/log/installdoctor/freshclam.error.log + /var/log/clamav/freshclam.error.log StandardOutPath - /var/log/installdoctor/freshclam.output.log + /var/log/clamav/freshclam.output.log {{- end -}} diff --git a/software.yml b/software.yml index 406bce57..0d707518 100644 --- a/software.yml +++ b/software.yml @@ -2306,12 +2306,12 @@ softwarePackages: #!/usr/bin/env bash # Setting up launchd services if [ -d /Applications ] && [ -d /System ]; then - sudo mkdir -p /var/log/installdoctor - sudo chown $USER /var/log/installdoctor - sudo cp -f "$HOME/.local/etc/clamav/installdoctor.clamdscan.plist.tmpl" /Library/LaunchDaemons/installdoctor.clamdscan.plist - sudo cp -f "$HOME/.local/etc/clamav/installdoctor.freshclam.plist.tmpl" /Library/LaunchDaemons/installdoctor.freshclam.plist - sudo launchctl load -w /Library/LaunchDaemons/installdoctor.clamdscan.plist - sudo launchctl load -w /Library/LaunchDaemons/installdoctor.freshclam.plist + sudo mkdir -p /var/log/clamav + sudo chown $USER /var/log/clamav + sudo cp -f "$HOME/.local/etc/clamav/clamdscan.plist.tmpl" /Library/LaunchDaemons/clamdscan.plist + sudo cp -f "$HOME/.local/etc/clamav/freshclam.plist.tmpl" /Library/LaunchDaemons/freshclam.plist + sudo launchctl load -w /Library/LaunchDaemons/clamdscan.plist + sudo launchctl load -w /Library/LaunchDaemons/freshclam.plist fi # Add freshclam.conf if [ -f "$HOME/.local/etc/clamav/freshclam.conf" ]; then