@hasna/recordings 0.3.1 → 0.3.8

package/scripts/install_macos_app.sh

@@ -126,18 +126,18 @@ require_absolute_canonical_owned_home() {
   local canonical
   case "$candidate" in
     /*) ;;
-    *) echo "Recordings.app installation requires HOME to be an absolute canonical path." >&2; exit 1 ;;
+    *) echo "HasnaRecordings.app installation requires HOME to be an absolute canonical path." >&2; exit 1 ;;
   esac
   [ -d "$candidate" ] && [ ! -L "$candidate" ] || {
-    echo "Recordings.app installation requires HOME to be an absolute canonical path to a non-symlink directory." >&2
+    echo "HasnaRecordings.app installation requires HOME to be an absolute canonical path to a non-symlink directory." >&2
     exit 1
   }
   canonical="$(cd "$candidate" 2>/dev/null && builtin pwd -P)" || {
-    echo "Recordings.app installation could not resolve HOME canonically." >&2
+    echo "HasnaRecordings.app installation could not resolve HOME canonically." >&2
     exit 1
   }
   [ "$candidate" = "$canonical" ] || {
-    echo "Recordings.app installation requires HOME to be an absolute canonical path." >&2
+    echo "HasnaRecordings.app installation requires HOME to be an absolute canonical path." >&2
     exit 1
   }
   [ "$("$STAT_EXECUTABLE" -f '%u' "$candidate")" = "$("$ID_EXECUTABLE" -u)" ] || {
@@ -168,6 +168,9 @@ Artifact and version:
 
 Target selection:
   --expected-hostname <name>           Require this live short hostname before mutating
+  --variant <full|bar>                 Artifact variant the operator intends to install;
+                                       the manifest variant is verified against this at
+                                       install time (default: full)
   --artifact-policy <release|local-only>
                                        Trust policy to evaluate the artifact under
   --approved-target <name>             Approved target for a local-only artifact
@@ -214,6 +217,7 @@ EXPECTED_NEW_IDENTITY_SHA256=""
 EXPECTED_HOSTNAME=""
 EXPECTED_HOSTNAME_SET=0
 ARTIFACT_POLICY="release"
+INSTALL_VARIANT="full"
 APPROVED_TARGET="fleet"
 APPROVED_TARGET_IDENTITY_KIND=""
 APPROVED_TARGET_IDENTITY_SHA256="none"
@@ -254,6 +258,16 @@ while [ "$#" -gt 0 ]; do
       EXPECTED_HOSTNAME_SET=1
       shift 2
       ;;
+    --variant)
+      case "${2:-}" in
+        full|bar) INSTALL_VARIANT="${2}" ;;
+        *)
+          echo "Install variant must be full or bar." >&2
+          exit 2
+          ;;
+      esac
+      shift 2
+      ;;
     --artifact-policy)
       case "${2:-}" in
         release) ARTIFACT_POLICY="release" ;;
@@ -338,7 +352,7 @@ require_absolute_executable "BUN_EXECUTABLE" "$BUN_EXECUTABLE"
 require_absolute_canonical_owned_home
 
 if [ "$("$UNAME_EXECUTABLE" -s)" != "Darwin" ]; then
-  echo "Recordings.app installation is only supported on macOS." >&2
+  echo "HasnaRecordings.app installation is only supported on macOS." >&2
   exit 1
 fi
 
@@ -532,7 +546,8 @@ fi
 "$BUN_EXECUTABLE" "$ARTIFACT_TOOL" native-fs-guard-check
 DATA_DIR="${HOME}/.hasna/recordings"
 DATA_PARENT="$("$DIRNAME_EXECUTABLE" "$DATA_DIR")"
-APP_DEST="${HOME}/Applications/Recordings.app"
+MANIFEST_BUNDLE_NAME="HasnaRecordings.app"
+APP_DEST="${HOME}/Applications/${MANIFEST_BUNDLE_NAME}"
 APP_PARENT="$("$DIRNAME_EXECUTABLE" "$APP_DEST")"
 ROLLBACK_DIR="${DATA_DIR}/rollbacks"
 JOURNAL_PATH="${APP_PARENT}/.Recordings-install-transaction.json"
@@ -779,7 +794,7 @@ acquire_install_lock() {
         if kill -0 "$owner_pid" 2>/dev/null; then
           actual_start="$("$PS_EXECUTABLE" -o lstart= -p "$owner_pid" 2>/dev/null | "$TR_EXECUTABLE" -s ' ' | "$SED_EXECUTABLE" 's/^ //;s/ $//' || true)"
           if [ -z "$owner_start" ] || [ -z "$actual_start" ] || [ "$owner_start" = "$actual_start" ]; then
-            echo "Another Recordings.app installer owns the active install lock." >&2
+            echo "Another HasnaRecordings.app installer owns the active install lock." >&2
             exit 1
           fi
         fi
@@ -792,17 +807,17 @@ acquire_install_lock() {
       now="$("$DATE_EXECUTABLE" +%s)"
       lock_age=$((now - $("$STAT_EXECUTABLE" -f '%m' "$LOCK_DIR")))
       if [ "$lock_age" -lt "$stale_seconds" ]; then
-        echo "Recordings.app install lock is incomplete and too recent to reclaim safely." >&2
+        echo "HasnaRecordings.app install lock is incomplete and too recent to reclaim safely." >&2
         exit 1
       fi
     fi
     stale_claim="${LOCK_DIR}.stale.$$"
     if ! "$MV_EXECUTABLE" "$LOCK_DIR" "$stale_claim" 2>/dev/null; then
-      echo "Recordings.app install lock changed during stale-owner recovery." >&2
+      echo "HasnaRecordings.app install lock changed during stale-owner recovery." >&2
       exit 1
     fi
     "$RM_EXECUTABLE" -rf "$stale_claim"
-    "$MKDIR_EXECUTABLE" -m 700 "$LOCK_DIR" || { echo "Could not acquire Recordings.app install lock." >&2; exit 1; }
+    "$MKDIR_EXECUTABLE" -m 700 "$LOCK_DIR" || { echo "Could not acquire HasnaRecordings.app install lock." >&2; exit 1; }
   fi
   LOCK_OWNED=1
   local start
@@ -1248,13 +1263,13 @@ stop_uncommitted_candidate() {
   done <<< "$remaining"
   "$SLEEP_EXECUTABLE" 0.1
   [ -z "$(pids_for_exact_executable "$expected")" ] || {
-    echo "Uncommitted Recordings.app process could not be stopped before recovery." >&2
+    echo "Uncommitted HasnaRecordings.app process could not be stopped before recovery." >&2
     return 1
   }
 }
 
 if [ -f "$JOURNAL_PATH" ]; then
-  echo "Recovering incomplete Recordings.app installation transaction." >&2
+  echo "Recovering incomplete HasnaRecordings.app installation transaction." >&2
   if ! RECOVER_WAS_RUNNING="$("$BUN_EXECUTABLE" "$ARTIFACT_TOOL" journal-get --journal "$JOURNAL_PATH" --field was_running)" || \
      ! RECOVER_PHASE="$("$BUN_EXECUTABLE" "$ARTIFACT_TOOL" journal-get --journal "$JOURNAL_PATH" --field phase)" || \
      ! RECOVER_RUNNING_APP_PATHS_JSON="$("$BUN_EXECUTABLE" "$ARTIFACT_TOOL" journal-get --journal "$JOURNAL_PATH" --field prior_running_app_paths)"; then
@@ -1323,6 +1338,7 @@ MANIFEST_SNAPSHOT="${WORK_DIR}/$("$BASENAME_EXECUTABLE" "$MANIFEST_PATH")"
   --source-sha "$EXPECTED_SOURCE_SHA" \
   --version "$EXPECTED_VERSION" \
   --artifact-policy "$ARTIFACT_POLICY" \
+  --variant "$INSTALL_VARIANT" \
   --approved-target "$APPROVED_TARGET" \
   --approved-target-identity-kind "$APPROVED_TARGET_IDENTITY_KIND" \
   --approved-target-identity-sha256 "$APPROVED_TARGET_IDENTITY_SHA256"
@@ -1330,6 +1346,22 @@ MANIFEST_BUILDER_IDENTITY_KIND="$("$BUN_EXECUTABLE" "$ARTIFACT_TOOL" manifest-ge
   --manifest "$MANIFEST_SNAPSHOT" \
   --manifest-sha256 "$EXPECTED_MANIFEST_SHA256" \
   --field builder_identity_kind)"
+AUTHENTICATED_BUNDLE_NAME="$("$BUN_EXECUTABLE" "$ARTIFACT_TOOL" manifest-get \
+  --manifest "$MANIFEST_SNAPSHOT" \
+  --manifest-sha256 "$EXPECTED_MANIFEST_SHA256" \
+  --field bundle_name)"
+case "$AUTHENTICATED_BUNDLE_NAME" in
+  *.app) ;;
+  *)
+    echo "Authenticated artifact manifest carries an invalid bundle name: ${AUTHENTICATED_BUNDLE_NAME}." >&2
+    exit 1
+    ;;
+esac
+if [ "$AUTHENTICATED_BUNDLE_NAME" != "$MANIFEST_BUNDLE_NAME" ]; then
+  MANIFEST_BUNDLE_NAME="$AUTHENTICATED_BUNDLE_NAME"
+  APP_DEST="${HOME}/Applications/${MANIFEST_BUNDLE_NAME}"
+  APP_PARENT="$("$DIRNAME_EXECUTABLE" "$APP_DEST")"
+fi
 
 CURRENT_MACOS="$("$SW_VERS_EXECUTABLE" -productVersion)"
 MINIMUM_MACOS="$("$BUN_EXECUTABLE" "$ARTIFACT_TOOL" manifest-get \
@@ -1344,7 +1376,7 @@ if ! "$BUN_EXECUTABLE" -e '
     if ((actual[i] ?? 0) < (minimum[i] ?? 0)) process.exit(1);
   }
 ' "$CURRENT_MACOS" "$MINIMUM_MACOS"; then
-  echo "Recordings.app requires macOS ${MINIMUM_MACOS} or later; target is ${CURRENT_MACOS}." >&2
+  echo "HasnaRecordings.app requires macOS ${MINIMUM_MACOS} or later; target is ${CURRENT_MACOS}." >&2
   exit 1
 fi
 TARGET_ARCH="$("$UNAME_EXECUTABLE" -m)"
@@ -1354,14 +1386,14 @@ MANIFEST_ARCHITECTURES="$("$BUN_EXECUTABLE" "$ARTIFACT_TOOL" manifest-get \
   --field architectures)"
 case " ${MANIFEST_ARCHITECTURES} " in
   *" ${TARGET_ARCH} "*) ;;
-  *) echo "Recordings.app artifact does not support target architecture ${TARGET_ARCH}." >&2; exit 1 ;;
+  *) echo "HasnaRecordings.app artifact does not support target architecture ${TARGET_ARCH}." >&2; exit 1 ;;
 esac
 
 verify_secure_parent "$APP_PARENT"
 verify_existing_state_root
 
 STAGING_DIR="$("$MKTEMP_EXECUTABLE" -d "${APP_PARENT}/.Recordings-install.XXXXXX")"
-STAGED_APP="${STAGING_DIR}/Recordings.app"
+STAGED_APP="${STAGING_DIR}/${MANIFEST_BUNDLE_NAME}"
 "$BUN_EXECUTABLE" "$ARTIFACT_TOOL" verify-archive \
   --archive "$ARTIFACT_SNAPSHOT" \
   --manifest "$MANIFEST_SNAPSHOT" \
@@ -1370,6 +1402,7 @@ STAGED_APP="${STAGING_DIR}/Recordings.app"
   --source-sha "$EXPECTED_SOURCE_SHA" \
   --version "$EXPECTED_VERSION" \
   --artifact-policy "$ARTIFACT_POLICY" \
+  --variant "$INSTALL_VARIANT" \
   --approved-target "$APPROVED_TARGET" \
   --approved-target-identity-kind "$APPROVED_TARGET_IDENTITY_KIND" \
   --approved-target-identity-sha256 "$APPROVED_TARGET_IDENTITY_SHA256"
@@ -1379,7 +1412,7 @@ add_unique_app() {
   local existing
   if [ -e "$candidate" ] || [ -L "$candidate" ]; then
     [ -d "$candidate" ] && [ ! -L "$candidate" ] || {
-      echo "Recordings.app path is not a secure directory: ${candidate}" >&2
+      echo "HasnaRecordings.app path is not a secure directory: ${candidate}" >&2
       exit 1
     }
   fi
@@ -1491,7 +1524,7 @@ stop_old_processes() {
     "$SLEEP_EXECUTABLE" 0.1
   done
   if [ "$remaining" -ne 0 ]; then
-    echo "Existing Recordings.app process did not stop before replacement." >&2
+    echo "Existing HasnaRecordings.app process did not stop before replacement." >&2
     exit 1
   fi
 }
@@ -1512,7 +1545,7 @@ quiesce_old_processes() {
     fi
     "$SLEEP_EXECUTABLE" 0.1
   done
-  echo "Existing Recordings.app processes did not remain quiescent before replacement." >&2
+  echo "Existing HasnaRecordings.app processes did not remain quiescent before replacement." >&2
   exit 1
 }
 
@@ -1647,10 +1680,11 @@ write_journal() {
   --source-sha "$EXPECTED_SOURCE_SHA" \
   --version "$EXPECTED_VERSION" \
   --artifact-policy "$ARTIFACT_POLICY" \
+  --variant "$INSTALL_VARIANT" \
   --approved-target "$APPROVED_TARGET" \
   --approved-target-identity-kind "$APPROVED_TARGET_IDENTITY_KIND" \
   --approved-target-identity-sha256 "$APPROVED_TARGET_IDENTITY_SHA256"
-CANDIDATE_APP="$UNPACK_DIR/Recordings.app"
+CANDIDATE_APP="$UNPACK_DIR/${MANIFEST_BUNDLE_NAME}"
 
 "$BUN_EXECUTABLE" "$ARTIFACT_TOOL" verify-app \
   --app "$CANDIDATE_APP" \
@@ -1658,6 +1692,7 @@ CANDIDATE_APP="$UNPACK_DIR/Recordings.app"
   --manifest-sha256 "$EXPECTED_MANIFEST_SHA256" \
   --team-id "$EXPECTED_TEAM_ID" \
   --artifact-policy "$ARTIFACT_POLICY" \
+  --variant "$INSTALL_VARIANT" \
   --approved-target "$APPROVED_TARGET" \
   --approved-target-identity-kind "$APPROVED_TARGET_IDENTITY_KIND" \
   --approved-target-identity-sha256 "$APPROVED_TARGET_IDENTITY_SHA256"
@@ -1671,10 +1706,12 @@ fi
 DISCOVERED_APPS=()
 add_unique_app "$APP_DEST"
 add_unique_app "${DATA_DIR}/Recordings.app"
-for candidate in "${HOME}"/Applications/Recordings.app.*; do
+add_unique_app "${DATA_DIR}/HasnaRecordings.app"
+for candidate in "${HOME}"/Applications/Recordings.app.* "${HOME}"/Applications/HasnaRecordings.app.*; do
   add_unique_app "$candidate"
 done
 add_unique_app "/Applications/Recordings.app"
+add_unique_app "/Applications/HasnaRecordings.app"
 if [ -x "$MDFIND_EXECUTABLE" ]; then
   while IFS= read -r candidate; do
     [ -n "$candidate" ] || continue
@@ -1685,12 +1722,12 @@ fi
 MANAGEABLE_APPS=()
 for existing_app in ${DISCOVERED_APPS[@]+"${DISCOVERED_APPS[@]}"}; do
   case "$existing_app" in
-    "$APP_DEST"|"${DATA_DIR}/Recordings.app"|"${HOME}/Applications/Recordings.app."*)
+    "$APP_DEST"|"${DATA_DIR}/Recordings.app"|"${DATA_DIR}/HasnaRecordings.app"|"${HOME}/Applications/Recordings.app."*|"${HOME}/Applications/HasnaRecordings.app."*)
       echo "Duplicate disposition: archive transactionally, remove after activation: ${existing_app}"
       MANAGEABLE_APPS+=("$existing_app")
       ;;
     *)
-      echo "Duplicate Recordings.app at ${existing_app} is outside the transactional user install paths; archive or remove it before installing." >&2
+      echo "Duplicate HasnaRecordings.app at ${existing_app} is outside the transactional user install paths; archive or remove it before installing." >&2
       exit 1
       ;;
   esac
@@ -1847,6 +1884,7 @@ done
   --manifest-sha256 "$EXPECTED_MANIFEST_SHA256" \
   --team-id "$EXPECTED_TEAM_ID" \
   --artifact-policy "$ARTIFACT_POLICY" \
+  --variant "$INSTALL_VARIANT" \
   --approved-target "$APPROVED_TARGET" \
   --approved-target-identity-kind "$APPROVED_TARGET_IDENTITY_KIND" \
   --approved-target-identity-sha256 "$APPROVED_TARGET_IDENTITY_SHA256"
@@ -1916,7 +1954,7 @@ for ((refresh_attempt = 1; refresh_attempt <= 5; refresh_attempt++)); do
   fi
 done
 [ "$STOPPED_REFRESH_STABLE" -eq 1 ] || {
-  echo "Existing Recordings.app writers did not remain quiescent around the stopped-state refresh." >&2
+  echo "Existing HasnaRecordings.app writers did not remain quiescent around the stopped-state refresh." >&2
   exit 1
 }
 
@@ -1966,7 +2004,7 @@ for ((move_index = 0; move_index < MOVED_ORIGINAL_COUNT; move_index++)); do
   existing_app="${MOVED_ORIGINALS[$move_index]}"
   moved_path="${MOVED_PATHS[$move_index]}"
   [ "$("$BUN_EXECUTABLE" "$ARTIFACT_TOOL" tree-digest --path "$existing_app")" = "${MOVED_DIGESTS[$move_index]}" ] || {
-    echo "Installed Recordings.app changed after transactional backup planning." >&2
+    echo "Installed HasnaRecordings.app changed after transactional backup planning." >&2
     exit 1
   }
   RECORDINGS_TEST_INSTALLER_PID="$$" \
@@ -2012,6 +2050,7 @@ write_journal candidate-installed
   --manifest-sha256 "$EXPECTED_MANIFEST_SHA256" \
   --team-id "$EXPECTED_TEAM_ID" \
   --artifact-policy "$ARTIFACT_POLICY" \
+  --variant "$INSTALL_VARIANT" \
   --approved-target "$APPROVED_TARGET" \
   --approved-target-identity-kind "$APPROVED_TARGET_IDENTITY_KIND" \
   --approved-target-identity-sha256 "$APPROVED_TARGET_IDENTITY_SHA256"
@@ -2027,11 +2066,12 @@ fi
   --manifest-sha256 "$EXPECTED_MANIFEST_SHA256" \
   --team-id "$EXPECTED_TEAM_ID" \
   --artifact-policy "$ARTIFACT_POLICY" \
+  --variant "$INSTALL_VARIANT" \
   --approved-target "$APPROVED_TARGET" \
   --approved-target-identity-kind "$APPROVED_TARGET_IDENTITY_KIND" \
   --approved-target-identity-sha256 "$APPROVED_TARGET_IDENTITY_SHA256"
 SMOKE_TOOL_PATH="/usr/bin:/bin:/usr/sbin:/sbin:$("$DIRNAME_EXECUTABLE" "$BUN_EXECUTABLE")"
-PATH="$SMOKE_TOOL_PATH" "$RUNTIME_SMOKE" "$APP_DEST" "$BUN_EXECUTABLE"
+PATH="$SMOKE_TOOL_PATH" "$RUNTIME_SMOKE" "$APP_DEST" "$BUN_EXECUTABLE" --variant "$INSTALL_VARIANT"
 write_journal activated
 
 write_journal committed
@@ -2043,7 +2083,14 @@ STOPPED_RUNNING_APP=0
 if [ "$LAUNCH_APP" -eq 1 ] || [ "$was_running" -eq 1 ]; then
   EXPECTED_EXECUTABLE="$APP_DEST/Contents/MacOS/Recordings"
   RUNNING_EXECUTABLES+=("$EXPECTED_EXECUTABLE")
-  "$OPEN_EXECUTABLE" -n "$APP_DEST"
+  if [ "$INSTALL_VARIANT" = "bar" ]; then
+    # Bar installs relaunch with an explicit --bar-only so the launch record is
+    # self-describing; the compile-time RECORDINGS_BAR_ONLY default makes the bar
+    # windowless even without the argument.
+    "$OPEN_EXECUTABLE" -n "$APP_DEST" --args --bar-only
+  else
+    "$OPEN_EXECUTABLE" -n "$APP_DEST"
+  fi
   attempts=$((LAUNCH_TIMEOUT_SECONDS * 10))
   launched_pid=""
   launched_start_identity=""
@@ -2070,7 +2117,7 @@ if [ "$LAUNCH_APP" -eq 1 ] || [ "$was_running" -eq 1 ]; then
 fi
 
 if [ "$ARTIFACT_POLICY" = "local_only" ]; then
-  echo "Installed local-only Recordings.app for ${APPROVED_TARGET}; this artifact is ad-hoc signed and non-notarized."
+  echo "Installed local-only HasnaRecordings.app for ${APPROVED_TARGET}; this artifact is ad-hoc signed and non-notarized."
   if [ "$identity_migration" -eq 1 ]; then
     # Not a maybe: the designated requirement did change, under an explicit approval.
     echo "Code identity changed under --allow-adhoc-identity-migration; the Microphone and Accessibility grants held by the replaced app no longer apply and must be reauthorized."
@@ -2080,5 +2127,5 @@ if [ "$ARTIFACT_POLICY" = "local_only" ]; then
 elif [ "$identity_migration" -eq 1 ]; then
   echo "Installed a new signing identity; macOS will require one-time permission approval for this migration."
 else
-  echo "Installed verified Recordings.app release artifact: ${APP_DEST}"
+  echo "Installed verified HasnaRecordings.app release artifact: ${APP_DEST}"
 fi