Skip to content

armgit / cra

Public Imported from GitHub
0

The open-source Arc replacement for macOS. Spaces, pinned tabs, split view, Little Windows and Arc's shortcuts on Chromium, with your Arc sidebar imported in one go.

About shows the real version; dev builds stop competing with the release

Victor52411f2a85af
diff --git a/Sources/Cra/App/AppDelegate.swift b/Sources/Cra/App/AppDelegate.swift
index 19b0356..e7fecd0 100644
--- a/Sources/Cra/App/AppDelegate.swift
+++ b/Sources/Cra/App/AppDelegate.swift
@@ -750,10 +750,13 @@ final class AppDelegate: NSObject, NSApplicationDelegate, NSMenuItemValidation {
}
@objc private func showAbout() {
+ let info = Bundle.main.infoDictionary
+ let version = info?["CFBundleShortVersionString"] as? String ?? ""
+ let build = info?["CFBundleVersion"] as? String ?? ""
NSApp.orderFrontStandardAboutPanel(options: [
.applicationName: "Cra",
- .applicationVersion: "0.2",
- .version: "Chromium \(CraCEFRuntime.chromiumVersion())",
+ .applicationVersion: version,
+ .version: "\(build) · Chromium \(CraCEFRuntime.chromiumVersion())",
])
}
}
diff --git a/docs/arc-reverse-engineering.md b/docs/arc-reverse-engineering.md
index e290bd7..f50fa80 100644
--- a/docs/arc-reverse-engineering.md
+++ b/docs/arc-reverse-engineering.md
@@ -177,7 +177,7 @@ closes.
A TCC prompt left behind by a Cra instance launched from the agent's shell blocked every
GUI helper spawned from that shell (they never reached `applicationDidFinishLaunching`),
which silently invalidated three colour runs; `killall UserNotificationCenter` cleared it.
-Run the app from ~/Applications (scripts/build.sh installs there) so no prompt appears.
+Run the app from outside ~/Documents (`CRA_INSTALL_DIR=<dir> scripts/build.sh` copies it there) so no prompt appears.
Animations were verified with `screencapture -V` recordings and a per-frame difference
tool: space switch 11 consecutive 60 Hz frames, sidebar hide 10 frames with a fast start
and soft landing, command bar fade-in 7 frames; the 80 ms fade-out still lands in one frame.
diff --git a/scripts/build.sh b/scripts/build.sh
index b763758..d5bfb20 100755
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -4,11 +4,15 @@
# scripts/build.sh debug debug build
# CRA_SIGN_IDENTITY="Developer ID Application: …" scripts/build.sh
# distributable build (see docs/release.md)
+# CRA_INSTALL_DIR=<dir> scripts/build.sh
+# also copies the app to <dir>/Cra.app
+# Dev builds are version 0.0.0-dev and stay unregistered with LaunchServices, so
+# opening Cra (or a cra:// link) always picks the installed release.
set -euo pipefail
cd "$(dirname "$0")/.."
ROOT="$PWD"
CONFIG="${1:-release}"
-VERSION="${CRA_VERSION:-0.1.0}"
+VERSION="${CRA_VERSION:-0.0.0-dev}"
BUILD_NUMBER="${CRA_BUILD:-$(date +%Y%m%d%H%M)}"
scripts/fetch-cef.sh
@@ -88,15 +92,15 @@ mkdir -p "$FINAL_APP"
rsync -a --delete "$APP/" "$FINAL_APP/"
"$LSREGISTER" -u "$APP" >/dev/null 2>&1 || true
rm -rf "$STAGE"
-"$LSREGISTER" -f "$FINAL_APP" || true
+"$LSREGISTER" -u "$FINAL_APP" >/dev/null 2>&1 || true
echo "Built $FINAL_APP"
-# Install outside ~/Documents: an app that runs from Documents makes macOS ask for
-# folder access and blocks the main thread until answered. The installed copy is the
-# one LaunchServices opens for cra:// URLs.
-INSTALL_APP="${CRA_INSTALL_DIR:-$HOME/Applications}/Cra.app"
-mkdir -p "$(dirname "$INSTALL_APP")"
-rsync -a --delete "$FINAL_APP/" "$INSTALL_APP/"
-"$LSREGISTER" -u "$FINAL_APP" >/dev/null 2>&1 || true
-"$LSREGISTER" -f "$INSTALL_APP" >/dev/null 2>&1 || true
-echo "Installed $INSTALL_APP"
+# Optional copy outside ~/Documents (an app that runs from Documents makes macOS ask
+# for folder access and blocks the main thread until answered).
+if [ -n "${CRA_INSTALL_DIR:-}" ]; then
+ INSTALL_APP="$CRA_INSTALL_DIR/Cra.app"
+ mkdir -p "$CRA_INSTALL_DIR"
+ rsync -a --delete "$FINAL_APP/" "$INSTALL_APP/"
+ "$LSREGISTER" -u "$INSTALL_APP" >/dev/null 2>&1 || true
+ echo "Installed $INSTALL_APP"
+fi
diff --git a/scripts/test-update.sh b/scripts/test-update.sh
index a5772d5..2b88633 100755
--- a/scripts/test-update.sh
+++ b/scripts/test-update.sh
@@ -58,15 +58,15 @@ IDLE=""
[ "$MODE" = idle ] && IDLE=20
if [ "$MODE" != again ] || [ ! -d "$DIR/old.app" ]; then
- echo "Building Cra 0.9.0 (old) and 0.9.1 (new)…"
+ echo "Building Cra 0.0.1 (old) and 0.0.2 (new)…"
mkdir -p "$DIR"
- CRA_VERSION=0.9.0 CRA_BUILD=1000 CRA_INSTALL_DIR="$DIR/install" scripts/build.sh debug > "$DIR/build.log" 2>&1
+ CRA_VERSION=0.0.1 CRA_BUILD=1000 scripts/build.sh debug > "$DIR/build.log" 2>&1
rm -rf "$DIR/old.app" && ditto build/Cra.app "$DIR/old.app"
- CRA_VERSION=0.9.1 CRA_BUILD=1001 CRA_INSTALL_DIR="$DIR/install" scripts/build.sh debug >> "$DIR/build.log" 2>&1
+ CRA_VERSION=0.0.2 CRA_BUILD=1001 scripts/build.sh debug >> "$DIR/build.log" 2>&1
make_copy build/Cra.app "$DIR/new"
rm -rf "$DIR/feed" && mkdir -p "$DIR/feed"
ditto -c -k --keepParent "$DIR/new/CraTest.app" "$DIR/feed/Cra.zip"
- printf '<h3>Cra 0.9.1</h3><ul><li>A test update served from your Mac.</li><li>Nothing here is real.</li></ul>' > "$DIR/notes.html"
+ printf '<h3>Cra 0.0.2</h3><ul><li>A test update served from your Mac.</li><li>Nothing here is real.</li></ul>' > "$DIR/notes.html"
CRA_UPDATE_URL="http://127.0.0.1:$PORT/Cra.zip" scripts/appcast.sh "$DIR/feed/Cra.zip" "$DIR/new/CraTest.app" "$DIR/notes.html"
fi
@@ -85,15 +85,15 @@ open "$DIR/run/CraTest.app"
cat <<EOF
-CraTest 0.9.0 is open (a separate test copy; your own Cra is untouched).
-Within a few seconds it finds 0.9.1 on the local feed.
+CraTest 0.0.1 is open (a separate test copy; your own Cra is untouched).
+Within a few seconds it finds 0.0.2 on the local feed.
EOF
case "$MODE" in
manual) echo " - The sidebar shows \"New Cra Version Available\". Click it, or Cra ▸ Check for Updates…, then Download." ;;
- idle) echo " - The sidebar shows \"An update is ready!\". Leave the mouse and keyboard alone for 20 s: CraTest restarts into 0.9.1 by itself." ;;
- *) echo " - The sidebar shows \"An update is ready!\". Click it to restart into 0.9.1, or quit CraTest to install on quit." ;;
+ idle) echo " - The sidebar shows \"An update is ready!\". Leave the mouse and keyboard alone for 20 s: CraTest restarts into 0.0.2 by itself." ;;
+ *) echo " - The sidebar shows \"An update is ready!\". Click it to restart into 0.0.2, or quit CraTest to install on quit." ;;
esac
cat <<EOF
- After the update the sidebar says "Cra Updated!"; Cra ▸ Check for Updates… then says you're up to date.
-Run again with "again" to start over from 0.9.0, and "stop" when you're done.
+Run again with "again" to start over from 0.0.1, and "stop" when you're done.
EOF