Fix conflicts and remove branding in file names

megabyte-labs · Dec 28, 2023 · be6858a · be6858a
1 parent ac4887d
commit be6858a
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/...clamav/installdoctor.clamdscan.plist.tmpl → ...dot_local/etc/clamav/clamdscan.plist.tmpl b/...clamav/installdoctor.clamdscan.plist.tmpl → ...dot_local/etc/clamav/clamdscan.plist.tmpl
@@ -4,7 +4,7 @@
 <plist version="1.0">
 <dict>
   <key>Label</key>
-  <string>installdoctor.clamdscan</string>
+  <string>clamav.clamdscan</string>
   <key>ProgramArguments</key>
   <array>
     <string>/usr/local/bin/clamdscan</string>
@@ -22,9 +22,9 @@
   <key>UserName</key>
   <string>root</string>
   <key>StandardErrorPath</key>
-  <string>/var/log/installdoctor/clamdscan.error.log</string>
+  <string>/var/log/clamav/clamdscan.error.log</string>
   <key>StandardOutPath</key>
-  <string>/var/log/installdoctor/clamdscan.output.log</string>
+  <string>/var/log/clamav/clamdscan.output.log</string>
 </dict>
 </plist>
 {{- end -}}
diff --git a/...clamav/installdoctor.freshclam.plist.tmpl → ...dot_local/etc/clamav/freshclam.plist.tmpl b/...clamav/installdoctor.freshclam.plist.tmpl → ...dot_local/etc/clamav/freshclam.plist.tmpl
@@ -4,7 +4,7 @@
 <plist version="1.0">
 <dict>
   <key>Label</key>
-  <string>installdoctor.freshclam</string>
+  <string>clamav.freshclam</string>
   <key>ProgramArguments</key>
   <array>
     <string>/usr/local/bin/freshclam</string>
@@ -22,9 +22,9 @@
   <key>UserName</key>
   <string>{{ $.chezmoi.username }}</string>
   <key>StandardErrorPath</key>
-  <string>/var/log/installdoctor/freshclam.error.log</string>
+  <string>/var/log/clamav/freshclam.error.log</string>
   <key>StandardOutPath</key>
-  <string>/var/log/installdoctor/freshclam.output.log</string>
+  <string>/var/log/clamav/freshclam.output.log</string>
 </dict>
 </plist>
 {{- end -}}
diff --git 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