Fix ./script/bundle to allow passing key

Conrad Irwin created 2 years ago

Change summary

crates/client/src/client.rs              |  1 -
crates/gpui/src/platform/mac/platform.rs |  2 --
crates/workspace/src/workspace.rs        |  7 -------
crates/zed/src/main.rs                   |  1 -
script/bundle                            | 10 ++++++++--
5 files changed, 8 insertions(+), 13 deletions(-)

Detailed changes

crates/client/src/client.rs

@@ -799,7 +799,6 @@ impl Client {
                     }
                 }
                 status = status_rx.next().fuse() => {
-                    dbg!(status);
                     return Err(anyhow!("authentication canceled"));
                 }
             }

crates/gpui/src/platform/mac/platform.rs

@@ -1014,7 +1014,6 @@ extern "C" fn open_urls(this: &mut Object, _: Sel, _: id, urls: id) {
 }
 
 extern "C" fn continue_user_activity(this: &mut Object, _: Sel, _: id, user_activity: id, _: id) {
-    dbg!("yay!");
     let url = unsafe {
         let url: id = msg_send!(user_activity, webpageURL);
         if url == nil {
@@ -1028,7 +1027,6 @@ extern "C" fn continue_user_activity(this: &mut Object, _: Sel, _: id, user_acti
             )
         }
     };
-    dbg!(&url);
     let platform = unsafe { get_foreground_platform(this) };
     if let Some(callback) = platform.0.borrow_mut().open_urls.as_mut() {
         callback(url.into_iter().collect());

crates/workspace/src/workspace.rs

@@ -4162,7 +4162,6 @@ async fn join_channel_internal(
     active_call: &ModelHandle<ActiveCall>,
     cx: &mut AsyncAppContext,
 ) -> Result<bool> {
-    dbg!("join channel internal");
     let should_prompt = active_call.read_with(cx, |active_call, cx| {
         let Some(room) = active_call.room().map(|room| room.read(cx)) else {
             return false;
@@ -4195,7 +4194,6 @@ async fn join_channel_internal(
             return Ok(false); // unreachable!() hopefully
         }
     }
-    dbg!("asdajdkjkasd");
 
     let client = cx.read(|cx| active_call.read(cx).client());
 
@@ -4221,8 +4219,6 @@ async fn join_channel_internal(
         }
     }
 
-    dbg!("past here");
-
     let room = active_call
         .update(cx, |active_call, cx| {
             active_call.join_channel(channel_id, cx)
@@ -4231,8 +4227,6 @@ async fn join_channel_internal(
 
     room.update(cx, |room, _| room.next_room_update()).await;
 
-    dbg!("wow");
-
     let task = room.update(cx, |room, cx| {
         if let Some((project, host)) = room.most_active_project() {
             return Some(join_remote_project(project, host, app_state.clone(), cx));
@@ -4273,7 +4267,6 @@ pub fn join_channel(
             &mut cx,
         )
         .await;
-        dbg!("joined!");
 
         // join channel succeeded, and opened a window
         if matches!(result, Ok(true)) {

crates/zed/src/main.rs

@@ -279,7 +279,6 @@ fn main() {
                         }
                         OpenRequest::JoinChannel { channel_id } => cx
                             .update(|cx| {
-                                dbg!("joining channel");
                                 workspace::join_channel(channel_id, app_state.clone(), None, cx)
                             })
                             .detach(),

script/bundle

@@ -128,7 +128,11 @@ fi
 
 echo "Copying WebRTC.framework into the frameworks folder"
 mkdir "${app_path}/Contents/Frameworks"
-cp -R target/${local_target_triple}/${target_dir}/WebRTC.framework "${app_path}/Contents/Frameworks/"
+if [ "$local_arch" = false ]; then
+    cp -R target/${local_target_triple}/${target_dir}/WebRTC.framework "${app_path}/Contents/Frameworks/"
+else
+    cp -R target/${target_dir}/WebRTC.framework "${app_path}/Contents/Frameworks/"
+fi
 
 if [[ -n $MACOS_CERTIFICATE && -n $MACOS_CERTIFICATE_PASSWORD && -n $APPLE_NOTARIZATION_USERNAME && -n $APPLE_NOTARIZATION_PASSWORD ]]; then
     echo "Signing bundle with Apple-issued certificate"
@@ -144,7 +148,9 @@ if [[ -n $MACOS_CERTIFICATE && -n $MACOS_CERTIFICATE_PASSWORD && -n $APPLE_NOTAR
 else
     echo "One or more of the following variables are missing: MACOS_CERTIFICATE, MACOS_CERTIFICATE_PASSWORD, APPLE_NOTARIZATION_USERNAME, APPLE_NOTARIZATION_PASSWORD"
     echo "Performing an ad-hoc signature, but this bundle should not be distributed"
-    codesign --force --deep --entitlements crates/zed/resources/zed.entitlements --sign - "${app_path}" -v
+    echo "If you see 'The application cannot be opened for an unexpected reason,' you likely don't have the necessary entitlements to run the application in your signing keychain"
+    echo "You will need to download a new signing key from developer.apple.com, add it to keychain, and export MACOS_SIGNING_KEY=<email address of signing key>"
+    codesign --force --deep --entitlements crates/zed/resources/zed.entitlements --sign ${MACOS_SIGNING_KEY:- -} "${app_path}" -v
 fi
 
 if [[ "$target_dir" = "debug" && "$local_only" = false ]]; then