Skip to content

Commit 40cd64d

Browse files
mhaeusermhaeuser
committed
Update daemon ID
1 parent 4b9cc41 commit 40cd64d

18 files changed

+47
-37
lines changed

‎Battery Toolkit.xcodeproj/project.pbxproj

+26-22
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727
CE39746E285A229F002D0EC9 /* BTActions.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE39746D285A229F002D0EC9 /* BTActions.swift */; };
2828
CE397472285A2396002D0EC9 /* BTDaemonXPCServer.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE397471285A2396002D0EC9 /* BTDaemonXPCServer.swift */; };
2929
CE397478285A25A1002D0EC9 /* BTDaemonXPCClient.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE397477285A25A1002D0EC9 /* BTDaemonXPCClient.swift */; };
30-
CE3C1D8528C7FB15008A0F7D /* EMH49F8A2Y.me.mhaeuser.batterytoolkitd.plist in CopyFiles */ = {isa = PBXBuildFile; fileRef = CE675D9528C7E81600F05929 /* EMH49F8A2Y.me.mhaeuser.batterytoolkitd.plist */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
31-
CE3C1DA128C92A42008A0F7D /* EMH49F8A2Y.me.mhaeuser.batterytoolkitd in CopyFiles */ = {isa = PBXBuildFile; fileRef = CE39744B2859E6D3002D0EC9 /* EMH49F8A2Y.me.mhaeuser.batterytoolkitd */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
30+
CE3C1D8528C7FB15008A0F7D /* me.mhaeuser.batterytoolkitd.plist in CopyFiles */ = {isa = PBXBuildFile; fileRef = CE675D9528C7E81600F05929 /* me.mhaeuser.batterytoolkitd.plist */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
31+
CE3C1DA128C92A42008A0F7D /* me.mhaeuser.batterytoolkitd in CopyFiles */ = {isa = PBXBuildFile; fileRef = CE39744B2859E6D3002D0EC9 /* me.mhaeuser.batterytoolkitd */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
3232
CE3C1DA328C9329F008A0F7D /* BTDaemonManagement.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE3C1DA228C9329F008A0F7D /* BTDaemonManagement.swift */; };
3333
CE3C1DA728CA33FD008A0F7D /* BTLegacyHelperInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE3C1DA628CA33FD008A0F7D /* BTLegacyHelperInfo.swift */; };
3434
CE3C1DA828CA33FD008A0F7D /* BTLegacyHelperInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE3C1DA628CA33FD008A0F7D /* BTLegacyHelperInfo.swift */; };
@@ -119,7 +119,7 @@
119119
dstPath = Contents/Library/LaunchDaemons;
120120
dstSubfolderSpec = 1;
121121
files = (
122-
CE3C1D8528C7FB15008A0F7D /* EMH49F8A2Y.me.mhaeuser.batterytoolkitd.plist in CopyFiles */,
122+
CE3C1D8528C7FB15008A0F7D /* me.mhaeuser.batterytoolkitd.plist in CopyFiles */,
123123
);
124124
runOnlyForDeploymentPostprocessing = 0;
125125
};
@@ -129,7 +129,7 @@
129129
dstPath = Contents/Library/LaunchServices;
130130
dstSubfolderSpec = 1;
131131
files = (
132-
CE3C1DA128C92A42008A0F7D /* EMH49F8A2Y.me.mhaeuser.batterytoolkitd in CopyFiles */,
132+
CE3C1DA128C92A42008A0F7D /* me.mhaeuser.batterytoolkitd in CopyFiles */,
133133
);
134134
runOnlyForDeploymentPostprocessing = 0;
135135
};
@@ -177,7 +177,7 @@
177177
CE37DD0B283F80960060C43F /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
178178
CE37DD0D283F86F90060C43F /* SMCComm.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SMCComm.swift; sourceTree = "<group>"; };
179179
CE37DD0F284164160060C43F /* SMCComm+Power.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "SMCComm+Power.swift"; sourceTree = "<group>"; };
180-
CE39744B2859E6D3002D0EC9 /* EMH49F8A2Y.me.mhaeuser.batterytoolkitd */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = EMH49F8A2Y.me.mhaeuser.batterytoolkitd; sourceTree = BUILT_PRODUCTS_DIR; };
180+
CE39744B2859E6D3002D0EC9 /* me.mhaeuser.batterytoolkitd */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = me.mhaeuser.batterytoolkitd; sourceTree = BUILT_PRODUCTS_DIR; };
181181
CE39744C285A1D35002D0EC9 /* Battery Toolkit.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Battery Toolkit.app"; sourceTree = BUILT_PRODUCTS_DIR; };
182182
CE39746D285A229F002D0EC9 /* BTActions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BTActions.swift; sourceTree = "<group>"; };
183183
CE397471285A2396002D0EC9 /* BTDaemonXPCServer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BTDaemonXPCServer.swift; sourceTree = "<group>"; };
@@ -199,7 +199,7 @@
199199
CE5E5AE728DE31EB00AF1D07 /* BTSettingsMenuItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BTSettingsMenuItem.swift; sourceTree = "<group>"; };
200200
CE5E5AF228DF183E00AF1D07 /* BTAuthorizationRights.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BTAuthorizationRights.swift; sourceTree = "<group>"; };
201201
CE5E5AF728DF1CB100AF1D07 /* BTError.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BTError.swift; sourceTree = "<group>"; };
202-
CE675D9528C7E81600F05929 /* EMH49F8A2Y.me.mhaeuser.batterytoolkitd.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = EMH49F8A2Y.me.mhaeuser.batterytoolkitd.plist; sourceTree = "<group>"; };
202+
CE675D9528C7E81600F05929 /* me.mhaeuser.batterytoolkitd.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = me.mhaeuser.batterytoolkitd.plist; sourceTree = "<group>"; };
203203
CE675D9628C7E82E00F05929 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
204204
CE6B75FF28BC1995008DF170 /* ServiceManagement.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ServiceManagement.framework; path = System/Library/Frameworks/ServiceManagement.framework; sourceTree = SDKROOT; };
205205
CE6B760328BC19C7008DF170 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; };
@@ -285,11 +285,11 @@
285285
path = DaemonManagement;
286286
sourceTree = "<group>";
287287
};
288-
CE3974422859E518002D0EC9 /* EMH49F8A2Y.me.mhaeuser.batterytoolkitd */ = {
288+
CE3974422859E518002D0EC9 /* me.mhaeuser.batterytoolkitd */ = {
289289
isa = PBXGroup;
290290
children = (
291291
CE675D9628C7E82E00F05929 /* Info.plist */,
292-
CE675D9528C7E81600F05929 /* EMH49F8A2Y.me.mhaeuser.batterytoolkitd.plist */,
292+
CE675D9528C7E81600F05929 /* me.mhaeuser.batterytoolkitd.plist */,
293293
CE3C1D8028C7F622008A0F7D /* launchd.plist */,
294294
CEA80FD7285A56B50064ADEA /* BTDaemon.swift */,
295295
CEA80FD5285A565C0064ADEA /* BTDaemonComm.swift */,
@@ -300,7 +300,7 @@
300300
CEECE31028BAB12000821A3B /* BTPowerState.swift */,
301301
CE3A8F6C284D056D00A9E373 /* BTSettings.swift */,
302302
);
303-
path = EMH49F8A2Y.me.mhaeuser.batterytoolkitd;
303+
path = me.mhaeuser.batterytoolkitd;
304304
sourceTree = "<group>";
305305
};
306306
CE3A8F6E284D26BA00A9E373 /* Frameworks */ = {
@@ -324,14 +324,14 @@
324324
CE6B75F728BC18DD008DF170 /* Common */,
325325
CE9BD24728E8908000B6C61D /* AutostartHelper */,
326326
CEECE31928BB648F00821A3B /* BatteryToolkitService */,
327-
CE3974422859E518002D0EC9 /* EMH49F8A2Y.me.mhaeuser.batterytoolkitd */,
327+
CE3974422859E518002D0EC9 /* me.mhaeuser.batterytoolkitd */,
328328
CE52867528298B6D00860C7B /* BatteryToolkit */,
329329
CE3C1D8128C7F950008A0F7D /* uninstall.sh */,
330330
CE3A8F6E284D26BA00A9E373 /* Frameworks */,
331331
CEE1654F28E4B65B00DC2443 /* libSecCodeEx.a */,
332332
CE9BD24628E8908000B6C61D /* AutostartHelper.app */,
333333
CEECE31828BB648F00821A3B /* Battery Toolkit Service.xpc */,
334-
CE39744B2859E6D3002D0EC9 /* EMH49F8A2Y.me.mhaeuser.batterytoolkitd */,
334+
CE39744B2859E6D3002D0EC9 /* me.mhaeuser.batterytoolkitd */,
335335
CE39744C285A1D35002D0EC9 /* Battery Toolkit.app */,
336336
);
337337
sourceTree = "<group>";
@@ -506,9 +506,9 @@
506506
/* End PBXGroup section */
507507

508508
/* Begin PBXNativeTarget section */
509-
CE3974402859E518002D0EC9 /* EMH49F8A2Y.me.mhaeuser.batterytoolkitd */ = {
509+
CE3974402859E518002D0EC9 /* me.mhaeuser.batterytoolkitd */ = {
510510
isa = PBXNativeTarget;
511-
buildConfigurationList = CE3974452859E518002D0EC9 /* Build configuration list for PBXNativeTarget "EMH49F8A2Y.me.mhaeuser.batterytoolkitd" */;
511+
buildConfigurationList = CE3974452859E518002D0EC9 /* Build configuration list for PBXNativeTarget "me.mhaeuser.batterytoolkitd" */;
512512
buildPhases = (
513513
CE39743D2859E518002D0EC9 /* Sources */,
514514
CE39743E2859E518002D0EC9 /* Frameworks */,
@@ -517,9 +517,9 @@
517517
);
518518
dependencies = (
519519
);
520-
name = EMH49F8A2Y.me.mhaeuser.batterytoolkitd;
520+
name = me.mhaeuser.batterytoolkitd;
521521
productName = batterytoolkitd;
522-
productReference = CE39744B2859E6D3002D0EC9 /* EMH49F8A2Y.me.mhaeuser.batterytoolkitd */;
522+
productReference = CE39744B2859E6D3002D0EC9 /* me.mhaeuser.batterytoolkitd */;
523523
productType = "com.apple.product-type.tool";
524524
};
525525
CE52867228298B6D00860C7B /* Battery Toolkit */ = {
@@ -637,7 +637,7 @@
637637
projectRoot = "";
638638
targets = (
639639
CE52867228298B6D00860C7B /* Battery Toolkit */,
640-
CE3974402859E518002D0EC9 /* EMH49F8A2Y.me.mhaeuser.batterytoolkitd */,
640+
CE3974402859E518002D0EC9 /* me.mhaeuser.batterytoolkitd */,
641641
CEECE31728BB648F00821A3B /* Battery Toolkit Service */,
642642
CEE1654E28E4B65B00DC2443 /* SecCodeEx */,
643643
CE9BD24528E8908000B6C61D /* AutostartHelper */,
@@ -760,7 +760,7 @@
760760
/* Begin PBXTargetDependency section */
761761
CE397451285A2100002D0EC9 /* PBXTargetDependency */ = {
762762
isa = PBXTargetDependency;
763-
target = CE3974402859E518002D0EC9 /* EMH49F8A2Y.me.mhaeuser.batterytoolkitd */;
763+
target = CE3974402859E518002D0EC9 /* me.mhaeuser.batterytoolkitd */;
764764
targetProxy = CE397450285A2100002D0EC9 /* PBXContainerItemProxy */;
765765
};
766766
CE9BD25928E899E600B6C61D /* PBXTargetDependency */ = {
@@ -816,7 +816,7 @@
816816
__launchd_plist,
817817
"$(SRCROOT)/$(PRODUCT_NAME)/launchd.plist",
818818
);
819-
PRODUCT_BUNDLE_IDENTIFIER = "$(TARGET_NAME)";
819+
PRODUCT_BUNDLE_IDENTIFIER = me.mhaeuser.batterytoolkitd;
820820
SKIP_INSTALL = YES;
821821
};
822822
name = Debug;
@@ -834,7 +834,7 @@
834834
__launchd_plist,
835835
"$(SRCROOT)/$(PRODUCT_NAME)/launchd.plist",
836836
);
837-
PRODUCT_BUNDLE_IDENTIFIER = "$(TARGET_NAME)";
837+
PRODUCT_BUNDLE_IDENTIFIER = me.mhaeuser.batterytoolkitd;
838838
SKIP_INSTALL = YES;
839839
};
840840
name = Release;
@@ -846,7 +846,8 @@
846846
BT_APP_ID = me.mhaeuser.BatteryToolkit;
847847
BT_AUTOSTART_ID = me.mhaeuser.BatteryToolkitAutostart;
848848
BT_CODESIGN_CN = "Apple Development: [email protected] (FK3MXHN3BX)";
849-
BT_DAEMON_ID = EMH49F8A2Y.me.mhaeuser.batterytoolkitd;
849+
BT_DAEMON_CONN = EMH49F8A2Y.me.mhaeuser.batterytoolkitd;
850+
BT_DAEMON_ID = me.mhaeuser.batterytoolkitd;
850851
BT_SERVICE_ID = me.mhaeuser.BatteryToolkitService;
851852
CLANG_ANALYZER_GCD_PERFORMANCE = YES;
852853
CLANG_ANALYZER_LOCALIZABILITY_EMPTY_CONTEXT = YES;
@@ -929,6 +930,7 @@
929930
"\"BT_APP_ID_=\\\"$(BT_APP_ID)\\\"\"",
930931
"\"BT_AUTOSTART_ID_=\\\"$(BT_AUTOSTART_ID)\\\"\"",
931932
"\"BT_DAEMON_ID_=\\\"$(BT_DAEMON_ID)\\\"\"",
933+
"\"BT_DAEMON_CONN_=\\\"$(BT_DAEMON_CONN)\\\"\"",
932934
"\"BT_CODESIGN_CN_=\\\"$(BT_CODESIGN_CN)\\\"\"",
933935
"\"BT_SERVICE_ID_=\\\"$(BT_SERVICE_ID)\\\"\"",
934936
);
@@ -984,7 +986,8 @@
984986
BT_APP_ID = me.mhaeuser.BatteryToolkit;
985987
BT_AUTOSTART_ID = me.mhaeuser.BatteryToolkitAutostart;
986988
BT_CODESIGN_CN = "Apple Development: [email protected] (FK3MXHN3BX)";
987-
BT_DAEMON_ID = EMH49F8A2Y.me.mhaeuser.batterytoolkitd;
989+
BT_DAEMON_CONN = EMH49F8A2Y.me.mhaeuser.batterytoolkitd;
990+
BT_DAEMON_ID = me.mhaeuser.batterytoolkitd;
988991
BT_SERVICE_ID = me.mhaeuser.BatteryToolkitService;
989992
CLANG_ANALYZER_GCD_PERFORMANCE = YES;
990993
CLANG_ANALYZER_LOCALIZABILITY_EMPTY_CONTEXT = YES;
@@ -1065,6 +1068,7 @@
10651068
"\"BT_APP_ID_=\\\"$(BT_APP_ID)\\\"\"",
10661069
"\"BT_AUTOSTART_ID_=\\\"$(BT_AUTOSTART_ID)\\\"\"",
10671070
"\"BT_DAEMON_ID_=\\\"$(BT_DAEMON_ID)\\\"\"",
1071+
"\"BT_DAEMON_CONN_=\\\"$(BT_DAEMON_CONN)\\\"\"",
10681072
"\"BT_CODESIGN_CN_=\\\"$(BT_CODESIGN_CN)\\\"\"",
10691073
"\"BT_SERVICE_ID_=\\\"$(BT_SERVICE_ID)\\\"\"",
10701074
);
@@ -1213,7 +1217,7 @@
12131217
/* End XCBuildConfiguration section */
12141218

12151219
/* Begin XCConfigurationList section */
1216-
CE3974452859E518002D0EC9 /* Build configuration list for PBXNativeTarget "EMH49F8A2Y.me.mhaeuser.batterytoolkitd" */ = {
1220+
CE3974452859E518002D0EC9 /* Build configuration list for PBXNativeTarget "me.mhaeuser.batterytoolkitd" */ = {
12171221
isa = XCConfigurationList;
12181222
buildConfigurations = (
12191223
CE3974462859E518002D0EC9 /* Debug */,

‎BatteryToolkit/BTDaemonXPCClient.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ internal enum BTDaemonXPCClient {
206206
}
207207

208208
let connect = NSXPCConnection(
209-
machServiceName: BT_DAEMON_ID,
209+
machServiceName: BT_DAEMON_CONN,
210210
options: .privileged
211211
)
212212
connect.remoteObjectInterface = NSXPCInterface(

‎BatteryToolkit/DaemonManagement/BTDaemonManagement+Service.swift

+3-1
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,9 @@ internal extension BTDaemonManagement {
176176
BTDaemonXPCClient.prepareUpdate { _ in
177177
DispatchQueue.main.async {
178178
self.unregister { _ in
179-
self.forceRegister(run: 0, reply: reply)
179+
self.awaitUnregister(run: 0) { _ in
180+
self.forceRegister(run: 0, reply: reply)
181+
}
180182
}
181183
}
182184
}

‎BatteryToolkit/Info.plist

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
<true/>
77
<key>SMPrivilegedExecutables</key>
88
<dict>
9-
<key>EMH49F8A2Y.me.mhaeuser.batterytoolkitd</key>
10-
<string>identifier &quot;EMH49F8A2Y.me.mhaeuser.batterytoolkitd&quot; and anchor apple generic and certificate leaf[subject.CN] = &quot;$(BT_CODESIGN_CN)&quot; and certificate 1[field.1.2.840.113635.100.6.2.1] /* exists */</string>
9+
<key>me.mhaeuser.batterytoolkitd</key>
10+
<string>identifier &quot;me.mhaeuser.batterytoolkitd&quot; and anchor apple generic and certificate leaf[subject.CN] = &quot;$(BT_CODESIGN_CN)&quot; and certificate 1[field.1.2.840.113635.100.6.2.1] /* exists */</string>
1111
</dict>
1212
</dict>
1313
</plist>

‎Modules/BTPreprocessor/BTPreprocessor.h

+3
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@ extern const NSString *const BT_SERVICE_ID;
1919
/// The Battery Toolkit daemon identifier.
2020
extern const NSString *const BT_DAEMON_ID;
2121

22+
/// The Battery Toolkit daemon connection name.
23+
extern const NSString *const BT_DAEMON_CONN;
24+
2225
/// The Battery Toolkit Autostart identifier.
2326
extern const NSString *const BT_AUTOSTART_ID;
2427

‎Modules/BTPreprocessor/BTPreprocessor.m

+1
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,6 @@
1010
const NSString *const BT_APP_ID = @BT_APP_ID_;
1111
const NSString *const BT_SERVICE_ID = @BT_SERVICE_ID_;
1212
const NSString *const BT_DAEMON_ID = @BT_DAEMON_ID_;
13+
const NSString *const BT_DAEMON_CONN = @BT_DAEMON_CONN_;
1314
const NSString *const BT_AUTOSTART_ID = @BT_AUTOSTART_ID_;
1415
const NSString *const BT_CODESIGN_CN = @BT_CODESIGN_CN_;

‎EMH49F8A2Y.me.mhaeuser.batterytoolkitd/BTDaemon.swift ‎me.mhaeuser.batterytoolkitd/BTDaemon.swift

File renamed without changes.

‎EMH49F8A2Y.me.mhaeuser.batterytoolkitd/BTDaemonComm.swift ‎me.mhaeuser.batterytoolkitd/BTDaemonComm.swift

File renamed without changes.

‎EMH49F8A2Y.me.mhaeuser.batterytoolkitd/BTDaemonManagement.swift ‎me.mhaeuser.batterytoolkitd/BTDaemonManagement.swift

File renamed without changes.

‎EMH49F8A2Y.me.mhaeuser.batterytoolkitd/BTDaemonXPCServer.swift ‎me.mhaeuser.batterytoolkitd/BTDaemonXPCServer.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import Security
1212

1313
internal enum BTDaemonXPCServer {
1414
@MainActor private static let listener = NSXPCListener(
15-
machServiceName: BT_DAEMON_ID
15+
machServiceName: BT_DAEMON_CONN
1616
)
1717

1818
private static let delegate: NSXPCListenerDelegate = Delegate()

‎EMH49F8A2Y.me.mhaeuser.batterytoolkitd/BTDispatcher.swift ‎me.mhaeuser.batterytoolkitd/BTDispatcher.swift

File renamed without changes.

‎EMH49F8A2Y.me.mhaeuser.batterytoolkitd/BTPowerEvents.swift ‎me.mhaeuser.batterytoolkitd/BTPowerEvents.swift

File renamed without changes.

‎EMH49F8A2Y.me.mhaeuser.batterytoolkitd/BTPowerState.swift ‎me.mhaeuser.batterytoolkitd/BTPowerState.swift

File renamed without changes.

‎EMH49F8A2Y.me.mhaeuser.batterytoolkitd/BTSettings.swift ‎me.mhaeuser.batterytoolkitd/BTSettings.swift

File renamed without changes.

‎EMH49F8A2Y.me.mhaeuser.batterytoolkitd/Info.plist ‎me.mhaeuser.batterytoolkitd/Info.plist

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
<plist version="1.0">
44
<dict>
55
<key>CFBundleIdentifier</key>
6-
<string>EMH49F8A2Y.me.mhaeuser.batterytoolkitd</string>
6+
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
77
<key>CFBundleInfoDictionaryVersion</key>
88
<string>6.0</string>
99
<key>SMAuthorizedClients</key>
1010
<array>
11-
<string>identifier &quot;$(BT_APP_ID)&quot; and anchor apple generic and certificate leaf[subject.CN] = &quot;$(BT_CODESIGN_CN)&quot; and certificate 1[field.1.2.840.113635.100.6.2.1] /* exists */</string>
11+
<string>identifier "$(BT_APP_ID)" and anchor apple generic and certificate leaf[subject.CN] = "$(BT_CODESIGN_CN)" and certificate 1[field.1.2.840.113635.100.6.2.1] /* exists */</string>
1212
</array>
1313
</dict>
1414
</plist>

‎EMH49F8A2Y.me.mhaeuser.batterytoolkitd/launchd.plist ‎me.mhaeuser.batterytoolkitd/launchd.plist

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<key>AssociatedBundleIdentifiers</key>
1313
<string>me.mhaeuser.BatteryToolkit</string>
1414
<key>Label</key>
15-
<string>EMH49F8A2Y.me.mhaeuser.batterytoolkitd</string>
15+
<string>me.mhaeuser.batterytoolkitd</string>
1616
<key>RunAtLoad</key>
1717
<true/>
1818
<key>EnableTransactions</key>

‎EMH49F8A2Y.me.mhaeuser.batterytoolkitd/EMH49F8A2Y.me.mhaeuser.batterytoolkitd.plist ‎me.mhaeuser.batterytoolkitd/me.mhaeuser.batterytoolkitd.plist

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
<false/>
1111
</dict>
1212
<key>BundleProgram</key>
13-
<string>Contents/Library/LaunchServices/EMH49F8A2Y.me.mhaeuser.batterytoolkitd</string>
13+
<string>Contents/Library/LaunchServices/me.mhaeuser.batterytoolkitd</string>
1414
<key>Label</key>
15-
<string>EMH49F8A2Y.me.mhaeuser.batterytoolkitd</string>
15+
<string>me.mhaeuser.batterytoolkitd</string>
1616
<key>RunAtLoad</key>
1717
<true/>
1818
<key>EnableTransactions</key>

‎uninstall.sh

+5-5
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@
88
##
99

1010
# Remove the Battery Toolkit daemon.
11-
sudo rm /Library/LaunchDaemons/EMH49F8A2Y.me.mhaeuser.batterytoolkitd.plist
12-
sudo rm /Library/PrivilegedHelperTools/EMH49F8A2Y.me.mhaeuser.batterytoolkitd
13-
sudo launchctl remove EMH49F8A2Y.me.mhaeuser.batterytoolkitd
11+
sudo rm /Library/LaunchDaemons/me.mhaeuser.batterytoolkitd.plist
12+
sudo rm /Library/PrivilegedHelperTools/me.mhaeuser.batterytoolkitd
13+
sudo launchctl remove me.mhaeuser.batterytoolkitd
1414

1515
# Remove the Battery Toolkit daemon data.
16-
sudo defaults delete EMH49F8A2Y.me.mhaeuser.batterytoolkitd
17-
sudo security authorizationdb remove EMH49F8A2Y.me.mhaeuser.batterytoolkitd.manage
16+
sudo defaults delete me.mhaeuser.batterytoolkitd
17+
sudo security authorizationdb remove me.mhaeuser.batterytoolkitd.manage
1818

1919
# Remove the Battery Toolkit Autostart helper.
2020
launchctl remove me.mhaeuser.BatteryToolkitAutostart

0 commit comments

Comments
 (0)