Changeset 103

Timestamp:

11/06/07 12:02:35 (13 months ago)

Author:

jps

Message:

Fix pcscd_autostart for Leopard

Location:

trunk/pcscd_autostart

Files:

• Info.plist (modified) (1 diff)
• files/Library/OpenSC/bin/sc-securityd.py (modified) (1 diff)

trunk/pcscd_autostart/Info.plist

@@ -4 +4 @@
 <dict>
         <key>CFBundleGetInfoString</key>
-        <string>0.9.1, OpenSC Project</string>
+        <string>0.9.2, OpenSC Project</string>
         <key>CFBundleIdentifier</key>
         <string>org.opensc.pcscd_autostart</string>
         <key>CFBundleShortVersionString</key>
-        <string>0.9.1</string>
+        <string>0.9.2</string>
         <key>IFPkgFlagAllowBackRev</key>
         <false/>

trunk/pcscd_autostart/files/Library/OpenSC/bin/sc-securityd.py

@@ -1 @@
-#!/usr/bin/python2.3
-import plistlib, sys
+#!/usr/bin/python
+import plistlib, sys, platform
+from distutils.version import LooseVersion
 
-plistfile = "/etc/mach_init.d/securityd.plist"
-p = plistlib.Plist.fromFile(plistfile)
-if "inactive" in sys.argv:
-  p["Command"] = "/usr/sbin/securityd -s off"
-  p.write(plistfile)
-elif "active" in sys.argv:
-  p["Command"] = "/usr/sbin/securityd"
-  p.write(plistfile)
+OSXVersion = LooseVersion(platform.mac_ver()[0])
+IsLeopard = LooseVersion("10.5.0")
 
+if OSXVersion <= IsLeopard:
+  plistfile = "/System/Library/LaunchDaemons/com.apple.securityd.plist"
+  p = plistlib.Plist.fromFile(plistfile)
+  if "inactive" in sys.argv:
+    p.ProgramArguments = ['/usr/sbin/securityd', '-i', '-s', 'off']
+    p.write(plistfile)
+  elif "active" in sys.argv:
+    p.ProgramArguments = ['/usr/sbin/securityd', '-i']
+    p.write(plistfile)  
+else:
+  plistfile = "/etc/mach_init.d/securityd.plist"
+  p = plistlib.Plist.fromFile(plistfile)
+  if "inactive" in sys.argv:
+    p["Command"] = "/usr/sbin/securityd -s off"
+    p.write(plistfile)
+  elif "active" in sys.argv:
+    p["Command"] = "/usr/sbin/securityd"
+    p.write(plistfile)