Merge pull request #1 from SenseTime-FVG/fix/macos-installer-scripts

fix(macos): make pkg installer scripts run reliably

Author: yysjasmine

macos/build-pkg.sh

@@ -9,21 +9,30 @@ PROJECT_ROOT="$(cd "$SCRIPT_DIR/.." && pwd)"
 BUILD_DIR="$SCRIPT_DIR/build"
 DIST_DIR="$PROJECT_ROOT/dist"
 VERSION="1.0.0"
+SCRIPTS_DIR="$BUILD_DIR/scripts"
 
 rm -rf "$BUILD_DIR"
 mkdir -p "$BUILD_DIR/payload/usr/local/lib/agent-pack"
 mkdir -p "$DIST_DIR"
+mkdir -p "$SCRIPTS_DIR"
 
 # Copy project files into payload
 cp -R "$PROJECT_ROOT/shared" "$BUILD_DIR/payload/usr/local/lib/agent-pack/shared"
 cp -R "$PROJECT_ROOT/config" "$BUILD_DIR/payload/usr/local/lib/agent-pack/config"
 mkdir -p "$BUILD_DIR/payload/usr/local/lib/agent-pack/linux"
 cp -R "$PROJECT_ROOT/linux/lib" "$BUILD_DIR/payload/usr/local/lib/agent-pack/linux/lib"
 
+# pkgbuild requires runnable preinstall/postinstall scripts. Stage them in a
+# temp directory with executable permissions so the macOS package runs
+# reliably regardless of repo mode bits.
+cp "$SCRIPT_DIR/scripts/preinstall.sh" "$SCRIPTS_DIR/preinstall"
+cp "$SCRIPT_DIR/scripts/postinstall.sh" "$SCRIPTS_DIR/postinstall"
+chmod 755 "$SCRIPTS_DIR/preinstall" "$SCRIPTS_DIR/postinstall"
+
 # Build component package
 pkgbuild \
     --root "$BUILD_DIR/payload" \
-    --scripts "$SCRIPT_DIR/scripts" \
+    --scripts "$SCRIPTS_DIR" \
     --identifier "com.agentpack.pkg" \
     --version "$VERSION" \
     "$BUILD_DIR/AgentPack.pkg"

macos/scripts/postinstall.sh

@@ -4,6 +4,12 @@
 
 set -e
 
+POSTINSTALL_LOG="/private/tmp/agent-pack-postinstall.log"
+mkdir -p "$(dirname "$POSTINSTALL_LOG")"
+exec >>"$POSTINSTALL_LOG" 2>&1
+echo ""
+echo "[$(date '+%Y-%m-%d %H:%M:%S')] Starting Agent Pack macOS postinstall"
+
 INSTALL_DIR="/usr/local/lib/agent-pack"
 SHARED_DIR="$INSTALL_DIR/shared"
 CONFIG_DIR="$INSTALL_DIR/config"

macos/scripts/preinstall.sh

@@ -6,6 +6,14 @@ set -e
 
 echo "[Agent Pack] Pre-install: checking prerequisites..."
 
+# Installer runs with a stripped PATH on many macOS systems, so expose common
+# Homebrew locations before checking for brew.
+if [ -x /opt/homebrew/bin/brew ]; then
+    eval "$(/opt/homebrew/bin/brew shellenv)"
+elif [ -x /usr/local/bin/brew ]; then
+    export PATH="/usr/local/bin:/usr/local/sbin:$PATH"
+fi
+
 # Xcode Command Line Tools
 if ! xcode-select -p &>/dev/null; then
     echo ""