File tree 2 files changed +11
-4
lines changed
tooling/bundler/src/bundle/macos
2 files changed +11
-4
lines changed Original file line number Diff line number Diff line change
1
+ ---
2
+ " tauri-bundler " : patch
3
+ ---
4
+
5
+ Ensure the notarization ` RequestUUID ` and ` Status ` parser works even if the altool output does not have a newline after it.
Original file line number Diff line number Diff line change @@ -275,9 +275,10 @@ pub fn notarize(
275
275
. output_ok ( )
276
276
. context ( "failed to upload app to Apple's notarization servers." ) ?;
277
277
278
- let stdout = std:: str:: from_utf8 ( & output. stdout ) ?;
278
+ let mut stdout = std:: str:: from_utf8 ( & output. stdout ) ?. to_string ( ) ;
279
+ stdout. push ( '\n' ) ;
279
280
if let Some ( uuid) = Regex :: new ( r"\nRequestUUID = (.+?)\n" ) ?
280
- . captures_iter ( stdout)
281
+ . captures_iter ( & stdout)
281
282
. next ( )
282
283
{
283
284
info ! ( "notarization started; waiting for Apple response..." ) ;
@@ -325,9 +326,10 @@ fn get_notarization_status(
325
326
. output_ok ( ) ;
326
327
327
328
if let Ok ( output) = result {
328
- let stdout = std:: str:: from_utf8 ( & output. stdout ) ?;
329
+ let mut stdout = std:: str:: from_utf8 ( & output. stdout ) ?. to_string ( ) ;
330
+ stdout. push ( '\n' ) ;
329
331
if let Some ( status) = Regex :: new ( r"\n *Status: (.+?)\n" ) ?
330
- . captures_iter ( stdout)
332
+ . captures_iter ( & stdout)
331
333
. next ( )
332
334
{
333
335
let status = status[ 1 ] . to_string ( ) ;
You can’t perform that action at this time.
0 commit comments