[CalendarServer-changes] [15246] CalendarServer/trunk/bin

[source_changes at macosforge.org]

Revision: 15246
          http://trac.calendarserver.org//changeset/15246
Author:   cdaboo at apple.com
Date:     2015-10-28 12:32:32 -0700 (Wed, 28 Oct 2015)
Log Message:
-----------
Better utf-8 path handling.

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

Modified: CalendarServer/trunk/bin/testpods
===================================================================
--- CalendarServer/trunk/bin/testpods	2015-10-28 17:32:54 UTC (rev 15245)
+++ CalendarServer/trunk/bin/testpods	2015-10-28 19:32:32 UTC (rev 15246)
@@ -93,6 +93,7 @@
 # Set up sandbox
 
 sandboxdir="/tmp/cdt_server_sandbox💣"
+sandboxdirutf8="/tmp/cdt_server_sandbox\ud83d\udca3"
 
 if [ -d "${sandboxdir}" ]; then
   rm -rf "${sandboxdir}"
@@ -102,6 +103,10 @@
 serverrootA="${sandboxdir}/podA"
 serverrootB="${sandboxdir}/podB"
 
+configdirutf8="${sandboxdirutf8}/Config"
+serverrootAutf8="${sandboxdirutf8}/podA"
+serverrootButf8="${sandboxdirutf8}/podB"
+
 mkdir -p "${configdir}/auth"
 mkdir -p "${serverrootA}/Logs" "${serverrootA}/Run" "${serverrootA}/Data/Documents"
 mkdir -p "${serverrootB}/Logs" "${serverrootB}/Run" "${serverrootB}/Data/Documents"
@@ -116,9 +121,9 @@
 
 # Modify the plists
 
-python -c "import plistlib; f=plistlib.readPlist('${configdir}/caldavd-cdt.plist'); f['ConfigRoot'] = '${configdir}'; f['RunRoot'] = 'Run'; f['Authentication']['Kerberos']['Enabled'] = False; plistlib.writePlist(f, '${configdir}/caldavd-cdt.plist');"
-python -c "import plistlib; f=plistlib.readPlist('${configdir}/caldavd-cdt-podA.plist'); f['ImportConfig'] = '${configdir}/caldavd-cdt.plist'; f['ServerRoot'] = '${serverrootA}'; f['ConfigRoot'] = '${configdir}'; f['ProxyLoadFromFile'] = '${configdir}/auth/proxies-cdt.xml'; f['ResourceService']['params']['xmlFile'] = '${configdir}/auth/resources-cdt.xml'; f['DirectoryService']['params']['xmlFile'] = '${configdir}/auth/accounts-cdt.xml'; f['AugmentService']['params']['xmlFiles'] = ['${configdir}/auth/augments-cdt.xml']; plistlib.writePlist(f, '${configdir}/caldavd-cdt-podA.plist');"
-python -c "import plistlib; f=plistlib.readPlist('${configdir}/caldavd-cdt-podB.plist'); f['ImportConfig'] = '${configdir}/caldavd-cdt.plist'; f['ServerRoot'] = '${serverrootB}'; f['ConfigRoot'] = '${configdir}'; f['ProxyLoadFromFile'] = '${configdir}/auth/proxies-cdt.xml'; f['ResourceService']['params']['xmlFile'] = '${configdir}/auth/resources-cdt.xml'; f['DirectoryService']['params']['xmlFile'] = '${configdir}/auth/accounts-cdt.xml'; f['AugmentService']['params']['xmlFiles'] = ['${configdir}/auth/augments-cdt.xml']; plistlib.writePlist(f, '${configdir}/caldavd-cdt-podB.plist');"
+python -c "import plistlib; f=plistlib.readPlist('${configdir}/caldavd-cdt.plist'); f['ConfigRoot'] = '${configdirutf8}'; f['RunRoot'] = 'Run'; f['Authentication']['Kerberos']['Enabled'] = False; plistlib.writePlist(f, '${configdir}/caldavd-cdt.plist');"
+python -c "import plistlib; f=plistlib.readPlist('${configdir}/caldavd-cdt-podA.plist'); f['ImportConfig'] = '${configdirutf8}/caldavd-cdt.plist'; f['ServerRoot'] = '${serverrootAutf8}'; f['ConfigRoot'] = '${configdirutf8}'; f['ProxyLoadFromFile'] = '${configdirutf8}/auth/proxies-cdt.xml'; f['ResourceService']['params']['xmlFile'] = '${configdirutf8}/auth/resources-cdt.xml'; f['DirectoryService']['params']['xmlFile'] = '${configdirutf8}/auth/accounts-cdt.xml'; f['AugmentService']['params']['xmlFiles'] = ['${configdirutf8}/auth/augments-cdt.xml']; plistlib.writePlist(f, '${configdir}/caldavd-cdt-podA.plist');"
+python -c "import plistlib; f=plistlib.readPlist('${configdir}/caldavd-cdt-podB.plist'); f['ImportConfig'] = '${configdirutf8}/caldavd-cdt.plist'; f['ServerRoot'] = '${serverrootButf8}'; f['ConfigRoot'] = '${configdirutf8}'; f['ProxyLoadFromFile'] = '${configdirutf8}/auth/proxies-cdt.xml'; f['ResourceService']['params']['xmlFile'] = '${configdirutf8}/auth/resources-cdt.xml'; f['DirectoryService']['params']['xmlFile'] = '${configdirutf8}/auth/accounts-cdt.xml'; f['AugmentService']['params']['xmlFiles'] = ['${configdirutf8}/auth/augments-cdt.xml']; plistlib.writePlist(f, '${configdir}/caldavd-cdt-podB.plist');"
 
 runpod() {
 	local podsuffix="$1"; shift;

Modified: CalendarServer/trunk/bin/testserver
===================================================================
--- CalendarServer/trunk/bin/testserver	2015-10-28 17:32:54 UTC (rev 15245)
+++ CalendarServer/trunk/bin/testserver	2015-10-28 19:32:32 UTC (rev 15246)
@@ -96,6 +96,7 @@
 # Set up sandbox
 
 sandboxdir="/tmp/cdt_server_sandbox💣"
+sandboxdirutf8="/tmp/cdt_server_sandbox\ud83d\udca3"
 
 if [ -d "${sandboxdir}" ]; then
   rm -rf "${sandboxdir}"
@@ -104,6 +105,9 @@
 configdir="${sandboxdir}/Config"
 datadir="${sandboxdir}/Data"
 
+configdirutf8="${sandboxdirutf8}/Config"
+datadirutf8="${sandboxdirutf8}/Data"
+
 mkdir -p "${configdir}/Config" "${sandboxdir}/Logs" "${sandboxdir}/Run" "${datadir}/Documents"
 
 cp conf/caldavd-test.plist "${configdir}/caldavd-cdt.plist"
@@ -114,7 +118,7 @@
 
 # Modify the plist
 
-python -c "import plistlib; f=plistlib.readPlist('${configdir}/caldavd-cdt.plist'); f['EnableTrashCollection'] = True; f['HTTPPort'] = 18008; f['BindHTTPPorts'] = [18008]; f['SSLPort'] = 18443; f['BindSSLPorts'] = [18443]; f['Notifications']['Services']['AMP']['Port'] = 62312; f['ServerRoot'] = u'/tmp/cdt_server_sandbox\ud83d\udca3'; f['ConfigRoot'] = 'Config'; f['RunRoot'] = 'Run'; f['ProxyLoadFromFile'] = u'/tmp/cdt_server_sandbox\ud83d\udca3/Data/proxies-cdt.xml'; f['ResourceService']['params']['xmlFile'] = u'/tmp/cdt_server_sandbox\ud83d\udca3/Data/resources-cdt.xml'; f['DirectoryService']['params']['xmlFile'] = u'/tmp/cdt_server_sandbox\ud83d\udca3/Data/accounts-cdt.xml'; f['AugmentService']['params']['xmlFiles'] = [u'/tmp/cdt_server_sandbox\ud83d\udca3/Data/augments-cdt.xml']; f['Authentication']['Kerberos']['Enabled'] = False; plistlib.writePlist(f, '${configdir}/caldavd-cdt.plist');"
+python -c "import plistlib; f=plistlib.readPlist('${configdir}/caldavd-cdt.plist'); f['EnableTrashCollection'] = True; f['HTTPPort'] = 18008; f['BindHTTPPorts'] = [18008]; f['SSLPort'] = 18443; f['BindSSLPorts'] = [18443]; f['Notifications']['Services']['AMP']['Port'] = 62312; f['ServerRoot'] = '${sandboxdirutf8}'; f['ConfigRoot'] = 'Config'; f['RunRoot'] = 'Run'; f['ProxyLoadFromFile'] = '${datadirutf8}/proxies-cdt.xml'; f['ResourceService']['params']['xmlFile'] = '${datadirutf8}/resources-cdt.xml'; f['DirectoryService']['params']['xmlFile'] = '${datadirutf8}/accounts-cdt.xml'; f['AugmentService']['params']['xmlFiles'] = ['${datadirutf8}/augments-cdt.xml']; f['Authentication']['Kerberos']['Enabled'] = False; plistlib.writePlist(f, '${configdir}/caldavd-cdt.plist');"
 
 # Modify serverinfo to update ports
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20151028/2c938896/attachment.html>