Skip to content

Commit fb7e1f6

Browse files
MattKiazykMattKiazyk
authored
Merge pull request #480 from XcodesOrg/matt/privilegedHelperUpdate
Update privilege helper to xcodesOrg and Team
2 parents 8a0595a + 9ec90a3 commit fb7e1f6

17 files changed

Lines changed: 128 additions & 42 deletions

‎HelperXPCShared/HelperXPCShared.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import Foundation
22

3-
let machServiceName = "com.robotsandpencils.XcodesApp.Helper"
4-
let clientBundleID = "com.robotsandpencils.XcodesApp"
3+
let machServiceName = "com.xcodesorg.xcodesapp.Helper"
4+
let clientBundleID = "com.xcodesorg.xcodesapp"
55
let subjectOrganizationalUnit = Bundle.main.infoDictionary!["CODE_SIGNING_SUBJECT_ORGANIZATIONAL_UNIT"] as! String
66

77
@objc(HelperXPCProtocol)

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,8 @@ Follow the steps below to build and release a new version of Xcodes.app. For any
9797
# Update the version number in Xcode and commit the change, if necessary
9898

9999
# Question: Did anything in XPCHelper change?
100-
# - com.robotsandpencils.XcodesApp.Helper folder and HelperXPCShared
101-
# - if so, bump the version number in com.robotsandpencils.XcodesApp.Helper target.
100+
# - com.xcodesorg.xcodesapp.Helper folder and HelperXPCShared
101+
# - if so, bump the version number in com.xcodesorg.xcodesapp.Helper target.
102102
# Note: you do not have to bump the version number if nothing has changed.
103103
# Note2: If you do bump the version, the end user, must re-install the XPCHelper and give permission again.
104104

‎Scripts/uninstall_privileged_helper.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22

3-
PRIVILEGED_HELPER_LABEL=com.robotsandpencils.XcodesApp.Helper
3+
PRIVILEGED_HELPER_LABEL=com.xcodesorg.xcodesapp.Helper
44

55
sudo rm /Library/PrivilegedHelperTools/$PRIVILEGED_HELPER_LABEL
66
sudo rm /Library/LaunchDaemons/$PRIVILEGED_HELPER_LABEL.plist

‎Xcodes.xcodeproj/project.pbxproj‎

Lines changed: 40 additions & 32 deletions
Large diffs are not rendered by default.

‎Xcodes.xcodeproj/xcshareddata/xcschemes/com.robotsandpencils.XcodesApp.Helper.xcscheme‎

Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Scheme
3+
LastUpgradeVersion = "1500"
4+
version = "1.7">
5+
<BuildAction
6+
parallelizeBuildables = "YES"
7+
buildImplicitDependencies = "YES">
8+
<BuildActionEntries>
9+
<BuildActionEntry
10+
buildForTesting = "YES"
11+
buildForRunning = "YES"
12+
buildForProfiling = "YES"
13+
buildForArchiving = "YES"
14+
buildForAnalyzing = "YES">
15+
<BuildableReference
16+
BuildableIdentifier = "primary"
17+
BlueprintIdentifier = "CA9FF8AD2595967A00E47BAF"
18+
BuildableName = "com.xcodesorg.xcodesapp.Helper"
19+
BlueprintName = "com.xcodesorg.xcodesapp.Helper"
20+
ReferencedContainer = "container:Xcodes.xcodeproj">
21+
</BuildableReference>
22+
</BuildActionEntry>
23+
</BuildActionEntries>
24+
</BuildAction>
25+
<TestAction
26+
buildConfiguration = "Debug"
27+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
28+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
shouldUseLaunchSchemeArgsEnv = "YES"
30+
shouldAutocreateTestPlan = "YES">
31+
</TestAction>
32+
<LaunchAction
33+
buildConfiguration = "Debug"
34+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
35+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
36+
launchStyle = "0"
37+
useCustomWorkingDirectory = "NO"
38+
ignoresPersistentStateOnLaunch = "NO"
39+
debugDocumentVersioning = "YES"
40+
debugServiceExtension = "internal"
41+
allowLocationSimulation = "YES"
42+
viewDebuggingEnabled = "No">
43+
<BuildableProductRunnable
44+
runnableDebuggingMode = "0">
45+
<BuildableReference
46+
BuildableIdentifier = "primary"
47+
BlueprintIdentifier = "CA9FF8AD2595967A00E47BAF"
48+
BuildableName = "com.xcodesorg.xcodesapp.Helper"
49+
BlueprintName = "com.xcodesorg.xcodesapp.Helper"
50+
ReferencedContainer = "container:Xcodes.xcodeproj">
51+
</BuildableReference>
52+
</BuildableProductRunnable>
53+
</LaunchAction>
54+
<ProfileAction
55+
buildConfiguration = "Release"
56+
shouldUseLaunchSchemeArgsEnv = "YES"
57+
savedToolIdentifier = ""
58+
useCustomWorkingDirectory = "NO"
59+
debugDocumentVersioning = "YES">
60+
<BuildableProductRunnable
61+
runnableDebuggingMode = "0">
62+
<BuildableReference
63+
BuildableIdentifier = "primary"
64+
BlueprintIdentifier = "CA9FF8AD2595967A00E47BAF"
65+
BuildableName = "com.xcodesorg.xcodesapp.Helper"
66+
BlueprintName = "com.xcodesorg.xcodesapp.Helper"
67+
ReferencedContainer = "container:Xcodes.xcodeproj">
68+
</BuildableReference>
69+
</BuildableProductRunnable>
70+
</ProfileAction>
71+
<AnalyzeAction
72+
buildConfiguration = "Debug">
73+
</AnalyzeAction>
74+
<ArchiveAction
75+
buildConfiguration = "Release"
76+
revealArchiveInOrganizer = "YES">
77+
</ArchiveAction>
78+
</Scheme>

‎Xcodes/Resources/Info.plist‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@
3434
<true/>
3535
<key>SMPrivilegedExecutables</key>
3636
<dict>
37-
<key>com.robotsandpencils.XcodesApp.Helper</key>
38-
<string>identifier &quot;com.robotsandpencils.XcodesApp.Helper&quot; and info [CFBundleShortVersionString] &gt;= &quot;1.0.0&quot; and anchor apple generic and certificate leaf[subject.OU] = &quot;$(CODE_SIGNING_SUBJECT_ORGANIZATIONAL_UNIT)&quot;</string>
37+
<key>com.xcodesorg.xcodesapp.Helper</key>
38+
<string>identifier &quot;com.xcodesorg.xcodesapp.Helper&quot; and info [CFBundleShortVersionString] &gt;= &quot;1.0.0&quot; and anchor apple generic and certificate leaf[subject.OU] = &quot;$(CODE_SIGNING_SUBJECT_ORGANIZATIONAL_UNIT)&quot;</string>
3939
</dict>
4040
<key>SUFeedURL</key>
4141
<string>https://www.xcodes.app/appcast.xml</string>

com.robotsandpencils.XcodesApp.Helper/AuditTokenHack.h renamed to com.xcodesorg.xcodesapp.Helper/AuditTokenHack.h

File renamed without changes.

com.robotsandpencils.XcodesApp.Helper/AuditTokenHack.m renamed to com.xcodesorg.xcodesapp.Helper/AuditTokenHack.m

File renamed without changes.

com.robotsandpencils.XcodesApp.Helper/ConnectionVerifier.swift renamed to com.xcodesorg.xcodesapp.Helper/ConnectionVerifier.swift

File renamed without changes.

com.robotsandpencils.XcodesApp.Helper/Info.plist renamed to com.xcodesorg.xcodesapp.Helper/Info.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<string>$(CODE_SIGNING_SUBJECT_ORGANIZATIONAL_UNIT)</string>
1313
<key>SMAuthorizedClients</key>
1414
<array>
15-
<string>identifier "com.robotsandpencils.XcodesApp" and info [CFBundleShortVersionString] &gt;= "1.0.0" and anchor apple generic and certificate leaf[subject.OU] = "$(CODE_SIGNING_SUBJECT_ORGANIZATIONAL_UNIT)"</string>
15+
<string>identifier &quot;com.xcodesorg.xcodesapp&quot; and info [CFBundleShortVersionString] &gt;= &quot;1.0.0&quot; and anchor apple generic and certificate leaf[subject.OU] = &quot;$(CODE_SIGNING_SUBJECT_ORGANIZATIONAL_UNIT)&quot;</string>
1616
</array>
1717
</dict>
1818
</plist>

0 commit comments

Comments
 (0)