Use xcrun to invoke stapler to support non-standard locations, bump u…

…p bottle generation to include Monterey.

.github/workflows/release.yml

@@ -21,7 +21,7 @@ jobs:
       run: |
           # Experimental: brew the bottle ourselves to attach it to this release
           set -eu
-          OS_NAME=big_sur
+          OS_NAME=monterey
           VERSION=${GITHUB_REF#refs/tags/v*}
           BOTTLE_DIR=bottle_build
           BOTTLE_BIN_DIR=$BOTTLE_DIR/${{ env.PROJECT_NAME }}/$VERSION/bin
@@ -38,7 +38,7 @@ jobs:
       id: rosetta_m1_bottle
       run: |
           set -eu
-          OS_NAME=arm64_big_sur
+          OS_NAME=arm64_monterey
           VERSION=${GITHUB_REF#refs/tags/v*}
           BOTTLE_NAME=${{ env.PROJECT_NAME }}-$VERSION.$OS_NAME.bottle.tar.gz
 
@@ -47,7 +47,7 @@ jobs:
       id: vprev_bottle
       run: |
           set -eu
-          OS_NAME=catalina
+          OS_NAME=big_sur
           VERSION=${GITHUB_REF#refs/tags/v*}
           BOTTLE_NAME=${{ env.PROJECT_NAME }}-$VERSION.$OS_NAME.bottle.tar.gz
 
@@ -56,7 +56,7 @@ jobs:
       id: vprev_prev_bottle
       run: |
           set -eu
-          OS_NAME=mojave
+          OS_NAME=catalina
           VERSION=${GITHUB_REF#refs/tags/v*}
           BOTTLE_NAME=${{ env.PROJECT_NAME }}-$VERSION.$OS_NAME.bottle.tar.gz
 

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "xcnotary"
-version = "0.4.8"
+version = "0.4.9"
 authors = ["David Vartan <[email protected]>"]
 edition = "2018"
 license = "MIT OR Apache-2.0"

src/notarize/run.rs

@@ -181,8 +181,8 @@ impl NotarizeOp {
     }
 
     fn staple(&self) -> Result<(), OperationError> {
-        let output = Command::new("/usr/bin/stapler")
-            .arg("staple")
+        let output = Command::new("/usr/bin/xcrun")
+            .args(["stapler", "staple"])
             .arg(self.input_path.as_os_str())
             .output()
             .unwrap();