Skip to content

Commit 6306814

Browse files
committed
[DDW-1198] Try force-signing only *.node modules
1 parent 8f97442 commit 6306814

File tree

1 file changed

+20
-15
lines changed

1 file changed

+20
-15
lines changed

installers/common/MacInstaller.hs

Lines changed: 20 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,11 @@ function sign_cmd() {
125125
codesign --verbose=4 --deep --strict --timestamp --options=runtime --entitlements $XML_PATH --sign "$SIGN_ID" "$targetFile" 2>&1 | tee -a /tmp/codesign-output-${TS}.txt
126126
done
127127
}
128+
function sign_cmd_force() {
129+
for targetFile in "$@" ; do
130+
codesign --force --verbose=4 --deep --strict --timestamp --options=runtime --entitlements $XML_PATH --sign "$SIGN_ID" "$targetFile" 2>&1 | tee -a /tmp/codesign-output-${TS}.txt
131+
done
132+
}
128133
VERIFY_CMD="codesign --verbose=4 --verify --deep --strict"
129134
ENTITLEMENT_CMD="codesign -d --entitlements :-"
130135
LOG="2>&1 | tee -a /tmp/codesign-output-${TS}.txt"
@@ -150,21 +155,21 @@ sign_cmd "$ABS_PATH/Contents/Frameworks/Electron Framework.framework/Versions/A/
150155
sign_cmd "$ABS_PATH/Contents/Frameworks/Electron Framework.framework/Versions/A/Libraries/libvk_swiftshader.dylib"
151156

152157
# Sign native electron bindings and supplementary binaries
153-
sign_cmd "$ABS_PATH/Contents/Resources/app/build/usb_bindings.node"
154-
sign_cmd "$ABS_PATH/Contents/Resources/app/build/HID.node"
155-
sign_cmd "$ABS_PATH/Contents/Resources/app/build/detection.node"
156-
sign_cmd "$ABS_PATH/Contents/Resources/app/node_modules/blake-hash/prebuilds/darwin-x64/node.napi.node"
157-
sign_cmd "$ABS_PATH/Contents/Resources/app/node_modules/blake-hash/prebuilds/darwin-arm64/node.napi.node"
158-
sign_cmd "$ABS_PATH/Contents/Resources/app/node_modules/blake-hash/bin/darwin-x64-"*"/blake-hash.node"
159-
sign_cmd "$ABS_PATH/Contents/Resources/app/node_modules/blake-hash/bin/darwin-arm64-"*"/blake-hash.node"
160-
sign_cmd "$ABS_PATH/Contents/Resources/app/node_modules/blake-hash/build/Release/addon.node"
161-
sign_cmd "$ABS_PATH/Contents/Resources/app/node_modules/tiny-secp256k1/build/Release/secp256k1.node"
162-
sign_cmd "$ABS_PATH/Contents/Resources/app/node_modules/tiny-secp256k1/bin/darwin-x64-"*"/tiny-secp256k1.node"
163-
sign_cmd "$ABS_PATH/Contents/Resources/app/node_modules/tiny-secp256k1/bin/darwin-arm64-"*"/tiny-secp256k1.node"
164-
sign_cmd "$ABS_PATH/Contents/Resources/app/node_modules/usb-detection/build/Release/detection.node"
165-
sign_cmd "$ABS_PATH/Contents/Resources/app/node_modules/usb-detection/bin/darwin-arm64-"*"/usb-detection.node"
166-
sign_cmd "$ABS_PATH/Contents/Resources/app/node_modules/node-hid/bin/darwin-x64-"*"/node-hid.node"
167-
sign_cmd "$ABS_PATH/Contents/Resources/app/node_modules/node-hid/build/Release/HID.node"
158+
sign_cmd_force "$ABS_PATH/Contents/Resources/app/build/usb_bindings.node"
159+
sign_cmd_force "$ABS_PATH/Contents/Resources/app/build/HID.node"
160+
sign_cmd_force "$ABS_PATH/Contents/Resources/app/build/detection.node"
161+
sign_cmd_force "$ABS_PATH/Contents/Resources/app/node_modules/blake-hash/prebuilds/darwin-x64/node.napi.node"
162+
sign_cmd_force "$ABS_PATH/Contents/Resources/app/node_modules/blake-hash/prebuilds/darwin-arm64/node.napi.node"
163+
sign_cmd_force "$ABS_PATH/Contents/Resources/app/node_modules/blake-hash/bin/darwin-x64-"*"/blake-hash.node"
164+
sign_cmd_force "$ABS_PATH/Contents/Resources/app/node_modules/blake-hash/bin/darwin-arm64-"*"/blake-hash.node"
165+
sign_cmd_force "$ABS_PATH/Contents/Resources/app/node_modules/blake-hash/build/Release/addon.node"
166+
sign_cmd_force "$ABS_PATH/Contents/Resources/app/node_modules/tiny-secp256k1/build/Release/secp256k1.node"
167+
sign_cmd_force "$ABS_PATH/Contents/Resources/app/node_modules/tiny-secp256k1/bin/darwin-x64-"*"/tiny-secp256k1.node"
168+
sign_cmd_force "$ABS_PATH/Contents/Resources/app/node_modules/tiny-secp256k1/bin/darwin-arm64-"*"/tiny-secp256k1.node"
169+
sign_cmd_force "$ABS_PATH/Contents/Resources/app/node_modules/usb-detection/build/Release/detection.node"
170+
sign_cmd_force "$ABS_PATH/Contents/Resources/app/node_modules/usb-detection/bin/darwin-arm64-"*"/usb-detection.node"
171+
sign_cmd_force "$ABS_PATH/Contents/Resources/app/node_modules/node-hid/bin/darwin-x64-"*"/node-hid.node"
172+
sign_cmd_force "$ABS_PATH/Contents/Resources/app/node_modules/node-hid/build/Release/HID.node"
168173

169174
# Sign the whole component deeply
170175
sign_cmd "$ABS_PATH"

0 commit comments

Comments
 (0)