[CalendarServer-changes] [13972] CalendarServer/trunk/bin/testserver

source_changes at macosforge.org source_changes at macosforge.org
Wed Sep 17 11:30:18 PDT 2014


Revision: 13972
          http://trac.calendarserver.org//changeset/13972
Author:   sagen at apple.com
Date:     2014-09-17 11:30:18 -0700 (Wed, 17 Sep 2014)
Log Message:
-----------
Use PlistBuddy because plutil is less featureful in older OSes

Modified Paths:
--------------
    CalendarServer/trunk/bin/testserver

Modified: CalendarServer/trunk/bin/testserver
===================================================================
--- CalendarServer/trunk/bin/testserver	2014-09-17 18:28:40 UTC (rev 13971)
+++ CalendarServer/trunk/bin/testserver	2014-09-17 18:30:18 UTC (rev 13972)
@@ -107,14 +107,15 @@
 cp conf/auth/accounts-test.xml "${datadir}/accounts-cdt.xml"
 
 # Modify the plist
+pb="/usr/libexec/PlistBuddy"
 
-plutil -replace ServerRoot -string "${sandboxdir}" "${configdir}/caldavd-cdt.plist"
-plutil -replace ConfigRoot -string "Config" "${configdir}/caldavd-cdt.plist"
-plutil -replace RunRoot -string "Run" "${configdir}/caldavd-cdt.plist"
-plutil -replace ProxyLoadFromFile -string "${datadir}/proxies-cdt.xml" "${configdir}/caldavd-cdt.plist"
-plutil -replace ResourceService.params.xmlFile -string "${datadir}/resources-cdt.xml" "${configdir}/caldavd-cdt.plist"
-plutil -replace DirectoryService.params.xmlFile -string "${datadir}/accounts-cdt.xml" "${configdir}/caldavd-cdt.plist"
-plutil -replace AugmentService.params.xmlFile -xml "<array><string>${datadir}/augments-cdt.xml</string></array>" "${configdir}/caldavd-cdt.plist"
+"${pb}" -c "Set :ServerRoot ${sandboxdir}" "${configdir}/caldavd-cdt.plist"
+"${pb}" -c "Set :ConfigRoot Config" "${configdir}/caldavd-cdt.plist"
+"${pb}" -c "Set :RunRoot Run" "${configdir}/caldavd-cdt.plist"
+"${pb}" -c "Set :ProxyLoadFromFile ${datadir}/proxies-cdt.xml" "${configdir}/caldavd-cdt.plist"
+"${pb}" -c "Set :ResourceService:params:xmlFile ${datadir}/resources-cdt.xml" "${configdir}/caldavd-cdt.plist"
+"${pb}" -c "Set :DirectoryService:params:xmlFile ${datadir}/accounts-cdt.xml" "${configdir}/caldavd-cdt.plist"
+"${pb}" -c "Set :AugmentService:params:xmlFiles:0 ${datadir}/augments-cdt.xml" "${configdir}/caldavd-cdt.plist"
 
 # Start the server
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140917/9d2136df/attachment.html>


More information about the calendarserver-changes mailing list