Skip to content

feat: wire provision-machine.sh into setup.sh #59

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ProtocolWarden merged 1 commit into from
May 27, 2026
+30 −0
Merged

feat: wire provision-machine.sh into setup.sh #59

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .console/log.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Log

## 2026-05-27 — Wire provision-machine.sh into setup.sh

setup.sh now calls PlatformManifest/scripts/provision-machine.sh after the local bootstrap. Passes through --with-private and --force-hooks flags; --skip-provision keeps the old local-only behavior.

## 2026-05-26 — Repair pre-existing watcher_pane tests

Fixed 9 stale/regressed failures in tests/test_watcher_pane.py.
Expand Down
26 changes: 26 additions & 0 deletions setup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,38 @@
#!/usr/bin/env bash
# setup.sh — install OperatorConsole's repo wrapper as a shell command.
#
# Also provisions the dev machine (CL_HOME, RepoGraph registry, adapter hooks)
# via PlatformManifest/scripts/provision-machine.sh if it exists.
# Pass --skip-provision to run only the OC-local bootstrap steps.

set -euo pipefail

CONSOLE_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
GITHUB_DIR="$(cd "$CONSOLE_DIR/.." && pwd)"

SKIP_PROVISION=false
PROVISION_ARGS=()
while [[ $# -gt 0 ]]; do
case "$1" in
--skip-provision) SKIP_PROVISION=true; shift ;;
--with-private) PROVISION_ARGS+=("--with-private"); shift ;;
--force-hooks) PROVISION_ARGS+=("--force-hooks"); shift ;;
*) echo "setup.sh: unknown argument: $1" >&2; exit 2 ;;
esac
done

echo "▶ OperatorConsole setup"
echo " repo: $CONSOLE_DIR"
echo ""

bash "$CONSOLE_DIR/bootstrap.sh"
"$CONSOLE_DIR/console" symlink

PROVISION_SH="$GITHUB_DIR/PlatformManifest/scripts/provision-machine.sh"
if [[ "$SKIP_PROVISION" == false && -f "$PROVISION_SH" ]]; then
echo ""
bash "$PROVISION_SH" "${PROVISION_ARGS[@]}"
else
echo ""
echo " (skipping machine provision — run PlatformManifest/scripts/provision-machine.sh separately)"
fi
Loading