mirror of
https://github.com/hanzoai/bot.git
synced 2026-10-30 17:24:26 +00:00
zeekay
acaeda400a
Three coordinated things:
1. Resolve the committed upstream/main merge conflicts. 94 files were
sitting with raw <<<<<<< HEAD ... >>>>>>> upstream/main blocks. Every
conflict had HanzoBot/Bot on HEAD and OpenClaw on upstream. Resolved
by keeping HEAD everywhere — 540 conflict blocks.
2. Rewrite remaining OpenClaw text refs.
OPENCLAW → HANZO_BOT
OpenClaw → HanzoBot (PascalCase type identifiers)
openclaw → bot (codebase convention — botToken,
botUsername etc.; avoids invalid
hyphenated JS identifiers)
openclaw[_]/openclaw[A-Z] → bot[_]/bot[A-Z] (compound)
ai.openclaw.x → ai.hanzo.bot.x (JVM package path)
3. Delete or rename openclaw-named file paths (116 of them). Dead
duplicates with a Bot-named canonical from the partial migration:
deleted. Otherwise renamed.
ai/openclaw/** → deleted (ai/hanzo/bot/** canonical)
Sources/OpenClaw*/ → deleted (Sources/Bot* canonical)
Tests/OpenClawIPCTests/ → deleted (Tests/BotIPCTests canonical)
OpenClawKit/ → deleted (BotKit canonical)
openclaw-tools.*.ts → deleted (bot-tools.*.ts canonical)
openclaw-root.ts etc. → deleted (bot-root.ts canonical)
types.openclaw.ts → deleted (types.bot.ts canonical)
extensions/*/openclaw.plugin.json → renamed hanzo-bot.plugin.json
docs/start/openclaw.md → renamed hanzo-bot.md (+ zh-CN)
docs/assets/openclaw-*.png, whatsapp-openclaw*.jpg → deleted
scripts/.../openclaw-* → deleted (bot/hanzo-bot parallels)
openclaw.mjs → deleted (hanzo-bot.mjs is package.bin)
Then patched 65 broken JS/TS import strings where hanzo-bot had ended
up inside an import path ('./types.hanzo-bot.js' → './types.bot.js'
etc., since the on-disk filename uses the brand-neutral bot- prefix).
Pre-existing lint debt cleaned up to get oxlint --type-aware to 0/0:
removed the dead i18n test that referenced a path no longer existing;
defined the missing DIDConfig and WalletConfig types in types.base.ts
(they were imported but never declared); dropped unused imports;
collapsed redundant type assertion and a tautological meta.bot lookup
that the openclaw→bot rename made redundant.
The a2ui.bundle.js generated artifact is kept at its pre-rebrand
contents — it gets regenerated by 'pnpm canvas:a2ui:bundle' from
sources I cannot rebuild in this commit; the source side is clean.
Verified: 0 occurrences of openclaw (case-insensitive) in tree source
content, 0 file or directory paths with openclaw in the name; oxlint
--type-aware src test reports 0/0.
94 lines
3.1 KiB
Bash
Executable File
94 lines
3.1 KiB
Bash
Executable File
#!/usr/bin/env bash
|
|
set -euo pipefail
|
|
|
|
# Build the mac app bundle, then create a zip (Sparkle) + styled DMG (humans).
|
|
#
|
|
# Output:
|
|
# - dist/HanzoBot.app
|
|
# - dist/HanzoBot-<version>.zip
|
|
# - dist/HanzoBot-<version>.dmg
|
|
|
|
ROOT_DIR="$(cd "$(dirname "$0")/.." && pwd)"
|
|
BUILD_ROOT="$ROOT_DIR/apps/macos/.build"
|
|
PRODUCT="HanzoBot"
|
|
BUILD_CONFIG="${BUILD_CONFIG:-release}"
|
|
|
|
# Default to universal binary for distribution builds (supports both Apple Silicon and Intel Macs)
|
|
export BUILD_ARCHS="${BUILD_ARCHS:-all}"
|
|
|
|
# Use release bundle ID (not .debug) so Sparkle auto-update works.
|
|
# The .debug suffix in package-mac-app.sh blanks SUFeedURL intentionally for dev builds.
|
|
export BUNDLE_ID="${BUNDLE_ID:-ai.hanzo.bot.mac}"
|
|
|
|
"$ROOT_DIR/scripts/package-mac-app.sh"
|
|
|
|
APP="$ROOT_DIR/dist/HanzoBot.app"
|
|
if [[ ! -d "$APP" ]]; then
|
|
echo "Error: missing app bundle at $APP" >&2
|
|
exit 1
|
|
fi
|
|
|
|
VERSION=$(/usr/libexec/PlistBuddy -c "Print CFBundleShortVersionString" "$APP/Contents/Info.plist" 2>/dev/null || echo "0.0.0")
|
|
ZIP="$ROOT_DIR/dist/HanzoBot-$VERSION.zip"
|
|
DMG="$ROOT_DIR/dist/HanzoBot-$VERSION.dmg"
|
|
NOTARY_ZIP="$ROOT_DIR/dist/HanzoBot-$VERSION.notary.zip"
|
|
DSYM_ZIP="$ROOT_DIR/dist/HanzoBot-$VERSION.dSYM.zip"
|
|
SKIP_NOTARIZE="${SKIP_NOTARIZE:-0}"
|
|
NOTARIZE=1
|
|
SKIP_DSYM="${SKIP_DSYM:-0}"
|
|
|
|
if [[ "$SKIP_NOTARIZE" == "1" ]]; then
|
|
NOTARIZE=0
|
|
fi
|
|
|
|
if [[ "$NOTARIZE" == "1" ]]; then
|
|
echo "📦 Notary zip: $NOTARY_ZIP"
|
|
rm -f "$NOTARY_ZIP"
|
|
ditto -c -k --sequesterRsrc --keepParent "$APP" "$NOTARY_ZIP"
|
|
STAPLE_APP_PATH="$APP" "$ROOT_DIR/scripts/notarize-mac-artifact.sh" "$NOTARY_ZIP"
|
|
rm -f "$NOTARY_ZIP"
|
|
fi
|
|
|
|
echo "📦 Zip: $ZIP"
|
|
rm -f "$ZIP"
|
|
ditto -c -k --sequesterRsrc --keepParent "$APP" "$ZIP"
|
|
|
|
echo "💿 DMG: $DMG"
|
|
"$ROOT_DIR/scripts/create-dmg.sh" "$APP" "$DMG"
|
|
|
|
if [[ "$NOTARIZE" == "1" ]]; then
|
|
if [[ -n "${SIGN_IDENTITY:-}" ]]; then
|
|
echo "🔏 Signing DMG: $DMG"
|
|
/usr/bin/codesign --force --sign "$SIGN_IDENTITY" --timestamp "$DMG"
|
|
fi
|
|
"$ROOT_DIR/scripts/notarize-mac-artifact.sh" "$DMG"
|
|
fi
|
|
|
|
if [[ "$SKIP_DSYM" != "1" ]]; then
|
|
DSYM_ARM64="$(find "$BUILD_ROOT/arm64" -type d -path "*/$BUILD_CONFIG/$PRODUCT.dSYM" -print -quit)"
|
|
DSYM_X86="$(find "$BUILD_ROOT/x86_64" -type d -path "*/$BUILD_CONFIG/$PRODUCT.dSYM" -print -quit)"
|
|
if [[ -n "$DSYM_ARM64" || -n "$DSYM_X86" ]]; then
|
|
TMP_DSYM="$ROOT_DIR/dist/$PRODUCT.dSYM"
|
|
rm -rf "$TMP_DSYM"
|
|
if [[ -n "$DSYM_ARM64" && -n "$DSYM_X86" ]]; then
|
|
cp -R "$DSYM_ARM64" "$TMP_DSYM"
|
|
DWARF_OUT="$TMP_DSYM/Contents/Resources/DWARF/$PRODUCT"
|
|
DWARF_ARM="$DSYM_ARM64/Contents/Resources/DWARF/$PRODUCT"
|
|
DWARF_X86="$DSYM_X86/Contents/Resources/DWARF/$PRODUCT"
|
|
if [[ -f "$DWARF_ARM" && -f "$DWARF_X86" ]]; then
|
|
/usr/bin/lipo -create "$DWARF_ARM" "$DWARF_X86" -output "$DWARF_OUT"
|
|
else
|
|
echo "WARN: Missing DWARF binaries for dSYM merge (continuing)" >&2
|
|
fi
|
|
else
|
|
cp -R "${DSYM_ARM64:-$DSYM_X86}" "$TMP_DSYM"
|
|
fi
|
|
echo "🧩 dSYM: $DSYM_ZIP"
|
|
rm -f "$DSYM_ZIP"
|
|
ditto -c -k --keepParent "$TMP_DSYM" "$DSYM_ZIP"
|
|
rm -rf "$TMP_DSYM"
|
|
else
|
|
echo "WARN: dSYM not found; skipping zip (set SKIP_DSYM=1 to silence)" >&2
|
|
fi
|
|
fi
|