Rename project from devsetup to setup

mhfs · mhfs · commit fa7ecfb67556 · 2026-02-20T15:34:02.000-03:00
- Update all references: repo name, clone path, state directory, URLs, banners
- Add migration to move existing state and clone directories
- Rename GitHub repo from trusted/devsetup to trusted/setup
diff --git a/AGENTS.md b/AGENTS.md
@@ -1,6 +1,6 @@
 # AGENTS.md
 
-Guidance for AI coding agents working on the Trusted Dev Setup repository.
+Guidance for AI coding agents working on the Trusted Setup repository.
 
 ## Overview
 
@@ -9,7 +9,7 @@ This repo contains a bash bootstrap script that prepares developer machines with
 ## Architecture
 
 - `setup.sh` — Main entry point. Bash only. Detects OS, installs tools idempotently, then runs pending migrations.
-- `lib/migrate.sh` — Migration runner. Sourced by `setup.sh`. Tracks state in `~/.local/state/trusted/devsetup/migrations/`.
+- `lib/migrate.sh` — Migration runner. Sourced by `setup.sh`. Tracks state in `~/.local/state/trusted/setup/migrations/`.
 - `migrations/*.sh` — Run-once bash scripts for environment transitions. Named by Unix timestamp.
 
 ## Key rules
@@ -85,7 +85,7 @@ It does **NOT** install:
 
 ## Commands
 
-- `shellcheck -x setup.sh doctor.sh lib/*.sh ci/mock-op` — Lint bash scripts
+- `shellcheck -x setup.sh doctor.sh lib/*.sh migrations/*.sh ci/mock-op` — Lint bash scripts
 - `bash -n setup.sh` — Check for syntax errors without executing
 - `bash doctor.sh` — Run post-setup diagnostic checks
 - `date +%s` — Generate a migration timestamp
diff --git a/ARCHITECTURE.md b/ARCHITECTURE.md
@@ -1,4 +1,4 @@
-# Trusted Dev Setup - Architecture
+# Trusted Setup - Architecture
 
 ## Problem
 
@@ -8,7 +8,7 @@ This is a chicken-and-egg problem: you need the repo cloned to run `bin/setup`,
 
 ## Solution
 
-A centralized `trusted/devsetup` repository containing a bash bootstrap script (`setup.sh`) that prepares any developer machine with the baseline system tools required to clone and run any Trusted project's `bin/setup`.
+A centralized `trusted/setup` repository containing a bash bootstrap script (`setup.sh`) that prepares any developer machine with the baseline system tools required to clone and run any Trusted project's `bin/setup`.
 
 The script is invocable via `curl | bash` on a fresh machine (no prerequisites beyond bash and curl, which are present on all target platforms).
 
@@ -72,7 +72,7 @@ Migrations handle one-time transitions that are not naturally idempotent: removi
 Inspired by [Omarchy's migration system](https://github.com/basecamp/omarchy/blob/dev/bin/omarchy-migrate).
 
 - Migration scripts live in `migrations/` and are named `<timestamp>_<description>.sh`: e.g. `1740000000_remove_deprecated_tool.sh`
-- State is tracked in `~/.local/state/trusted/devsetup/migrations/` as empty marker files (one per completed migration)
+- State is tracked in `~/.local/state/trusted/setup/migrations/` as empty marker files (one per completed migration)
 - On each run of `setup.sh`, the migration runner:
   1. Scans `migrations/*.sh` sorted numerically
   2. Skips any migration whose marker file already exists
@@ -101,10 +101,10 @@ This removes the marker file for the given migration and re-executes it.
 
 ## State directory
 
-All local state is stored under `~/.local/state/trusted/devsetup/` (follows XDG Base Directory conventions):
+All local state is stored under `~/.local/state/trusted/setup/` (follows XDG Base Directory conventions):
 
 ```
-~/.local/state/trusted/devsetup/
+~/.local/state/trusted/setup/
 └── migrations/
     ├── 1740000000.sh    # marker: migration completed
     ├── 1740100000.sh
@@ -122,7 +122,7 @@ Options:
 
 Examples:
   # First-time setup (or re-run to update)
-  /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/trusted/devsetup/main/setup.sh)"
+  /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/trusted/setup/main/setup.sh)"
 
   # Re-run a specific migration
   ./setup.sh --rerun 1740000000
@@ -132,7 +132,7 @@ Examples:
 
 ```bash
 # 1. One-time system bootstrap
-/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/trusted/devsetup/main/setup.sh)"
+/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/trusted/setup/main/setup.sh)"
 
 # 2. Clone any Trusted project
 gh repo clone trusted/<project>
@@ -144,7 +144,7 @@ cd <project> && bin/setup
 ## Repository structure
 
 ```
-devsetup/
+setup/
 ├── setup.sh              # Main bootstrap script (bash, entry point)
 ├── doctor.sh             # Read-only diagnostic script (verifies setup.sh outcomes)
 ├── lib/
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# Trusted Dev Setup
+# Trusted Setup
 
 Bootstraps a developer machine with the baseline tools required to work on Trusted projects.
 
@@ -26,7 +26,7 @@ Bootstraps a developer machine with the baseline tools required to work on Trust
 ## Quick start
 
 ```bash
-/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/trusted/devsetup/main/setup.sh)"
+/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/trusted/setup/main/setup.sh)"
 ```
 
 Then clone and set up any project:
@@ -40,16 +40,16 @@ cd <project> && bin/setup
 
 The script is idempotent. Run it again at any time to ensure your tools are up to date and apply new migrations.
 
-Locally from the cloned repo at `~/Work/devsetup`:
+Locally from the cloned repo at `~/Work/setup`:
 
 ```bash
-bash ~/Work/devsetup/setup.sh
+bash ~/Work/setup/setup.sh
 ```
 
 Via curl (fetches latest from GitHub):
 
 ```bash
-/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/trusted/devsetup/main/setup.sh)"
+/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/trusted/setup/main/setup.sh)"
 ```
 
 
@@ -58,7 +58,7 @@ Via curl (fetches latest from GitHub):
 Run `doctor.sh` at any time to check that all expected tools are installed and no migrations are pending. It never changes anything — only reports:
 
 ```bash
-bash ~/Work/devsetup/doctor.sh
+bash ~/Work/setup/doctor.sh
 ```
 
 ## Migrations
@@ -68,7 +68,7 @@ One-time environment changes are tracked as migration scripts in `migrations/`.
 To re-run a specific migration:
 
 ```bash
-bash ~/Work/devsetup/setup.sh --rerun <timestamp>
+bash ~/Work/setup/setup.sh --rerun <timestamp>
 ```
 
 ## How it works
diff --git a/doctor.sh b/doctor.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Trusted Dev Setup — Doctor
+# Trusted Setup — Doctor
 #
 # Read-only diagnostic script that verifies all tools and configuration
 # installed by setup.sh are present and working. Never modifies anything.
@@ -69,7 +69,7 @@ check_cmd() {
 # ---------------------------------------------------------------------------
 
 echo ""
-echo "= Trusted Dev Setup Doctor ="
+echo "= Trusted Setup Doctor ="
 echo ""
 echo "  Platform: $OS"
 echo ""
diff --git a/lib/common.sh b/lib/common.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Shared helpers for Trusted Dev Setup.
+# Shared helpers for Trusted Setup.
 # Sourced by setup.sh — do not execute directly.
 
 # ---------------------------------------------------------------------------
diff --git a/lib/migrate.sh b/lib/migrate.sh
@@ -1,12 +1,12 @@
 #!/bin/bash
 #
-# Migration runner for Trusted Dev Setup.
+# Migration runner for Trusted Setup.
 # Sourced by setup.sh — do not execute directly.
 #
 # Inspired by Omarchy's migration system:
 # https://github.com/basecamp/omarchy/blob/dev/bin/omarchy-migrate
 
-MIGRATION_STATE_DIR="$HOME/.local/state/trusted/devsetup/migrations"
+MIGRATION_STATE_DIR="$HOME/.local/state/trusted/setup/migrations"
 
 run_migrations() {
   local script_dir="$1"
diff --git a/lib/migrate_doctor.sh b/lib/migrate_doctor.sh
@@ -7,7 +7,7 @@
 
 fmt_header "Migrations"
 
-MIGRATION_STATE_DIR="$HOME/.local/state/trusted/devsetup/migrations"
+MIGRATION_STATE_DIR="$HOME/.local/state/trusted/setup/migrations"
 
 if [ -d "$MIGRATION_STATE_DIR" ]; then
   check_pass "Migration state directory exists"
diff --git a/lib/registries_setup.sh b/lib/registries_setup.sh
@@ -86,8 +86,8 @@ YARNRC_FILE="$HOME/.yarnrc.yml"
 
 # Build the npmScopes block. We overwrite the file each time to ensure
 # credentials stay current. Any pre-existing content that is NOT managed
-# by devsetup will be lost — this is intentional; ~/.yarnrc.yml is owned
-# by devsetup for scope configuration.
+# by setup will be lost — this is intentional; ~/.yarnrc.yml is owned
+# by setup for scope configuration.
 cat > "$YARNRC_FILE" <<EOF
 npmScopes:
   trusted:
diff --git a/lib/repos_doctor.sh b/lib/repos_doctor.sh
@@ -12,16 +12,16 @@ else
   check_fail "$HOME/Work directory does not exist"
 fi
 
-if [ -d "$HOME/Work/devsetup/.git" ]; then
-  check_pass "devsetup is cloned to $HOME/Work/devsetup"
+if [ -d "$HOME/Work/setup/.git" ]; then
+  check_pass "setup is cloned to $HOME/Work/setup"
 else
-  check_warn "devsetup not found at $HOME/Work/devsetup (ok if running from another location)"
+  check_warn "setup not found at $HOME/Work/setup (ok if running from another location)"
 fi
 
-if [ -f "$HOME/Work/devsetup/setup.sh" ]; then
-  check_pass "$HOME/Work/devsetup contains setup.sh"
+if [ -f "$HOME/Work/setup/setup.sh" ]; then
+  check_pass "$HOME/Work/setup contains setup.sh"
 else
-  check_warn "setup.sh not found in $HOME/Work/devsetup"
+  check_warn "setup.sh not found in $HOME/Work/setup"
 fi
 
 if [ -d "$HOME/Work/docs/.git" ]; then
diff --git a/lib/repos_setup.sh b/lib/repos_setup.sh
@@ -24,5 +24,5 @@ clone_to_work() {
   fi
 }
 
-clone_to_work "trusted/devsetup" "devsetup"
+clone_to_work "trusted/setup" "setup"
 clone_to_work "trusted/docs" "docs"
diff --git a/migrations/1771612397_rename_devsetup_to_setup.sh b/migrations/1771612397_rename_devsetup_to_setup.sh
@@ -0,0 +1,49 @@
+#!/bin/bash
+#
+# Rename devsetup -> setup.
+#
+# The project was renamed from trusted/devsetup to trusted/setup.
+# This migration moves:
+#   1. State directory: ~/.local/state/trusted/devsetup/ -> ~/.local/state/trusted/setup/
+#   2. Clone directory: ~/Work/devsetup/ -> ~/Work/setup/
+
+set -euo pipefail
+
+OLD_STATE_DIR="$HOME/.local/state/trusted/devsetup"
+NEW_STATE_DIR="$HOME/.local/state/trusted/setup"
+
+# --- State directory ---
+
+if [ -d "$OLD_STATE_DIR" ] && [ ! -d "$NEW_STATE_DIR" ]; then
+  mv "$OLD_STATE_DIR" "$NEW_STATE_DIR"
+  echo "  Moved state directory: $OLD_STATE_DIR -> $NEW_STATE_DIR"
+elif [ -d "$NEW_STATE_DIR" ]; then
+  echo "  State directory already at $NEW_STATE_DIR (skipping)"
+else
+  echo "  No old state directory found at $OLD_STATE_DIR (skipping)"
+fi
+
+# Clean up empty parent if nothing else lives under trusted/devsetup
+if [ -d "$OLD_STATE_DIR" ] && [ -z "$(ls -A "$OLD_STATE_DIR" 2>/dev/null)" ]; then
+  rmdir "$OLD_STATE_DIR" 2>/dev/null || true
+fi
+
+# --- Clone directory ---
+
+OLD_CLONE_DIR="$HOME/Work/devsetup"
+NEW_CLONE_DIR="$HOME/Work/setup"
+
+if [ -d "$OLD_CLONE_DIR/.git" ] && [ ! -d "$NEW_CLONE_DIR" ]; then
+  mv "$OLD_CLONE_DIR" "$NEW_CLONE_DIR"
+  echo "  Moved clone directory: $OLD_CLONE_DIR -> $NEW_CLONE_DIR"
+
+  # Update git remote to new repo URL
+  if git -C "$NEW_CLONE_DIR" remote get-url origin 2>/dev/null | grep -q "devsetup"; then
+    git -C "$NEW_CLONE_DIR" remote set-url origin "https://github.com/trusted/setup.git"
+    echo "  Updated git remote origin to trusted/setup"
+  fi
+elif [ -d "$NEW_CLONE_DIR" ]; then
+  echo "  Clone directory already at $NEW_CLONE_DIR (skipping)"
+else
+  echo "  No old clone directory found at $OLD_CLONE_DIR (skipping)"
+fi
diff --git a/setup.sh b/setup.sh
@@ -1,13 +1,13 @@
 #!/bin/bash
 #
-# Trusted Dev Setup
+# Trusted Setup
 #
 # Bootstraps a developer machine with the baseline tools required to clone
 # and run any Trusted project's bin/setup script.
 #
 # Usage:
 #   # First-time setup or update
-#   /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/trusted/devsetup/main/setup.sh)"
+#   /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/trusted/setup/main/setup.sh)"
 #
 #   # Re-run a specific migration
 #   ./setup.sh --rerun <timestamp>
@@ -21,37 +21,37 @@ set -euo pipefail
 if [ -n "${BASH_SOURCE[0]:-}" ] && [ -f "${BASH_SOURCE[0]}" ]; then
   SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 else
-  # Running via curl | bash — clone (or update) the repo at ~/Work/devsetup
-  DEVSETUP_CLONE_DIR="$HOME/Work/devsetup"
-  DEVSETUP_REPO="${DEVSETUP_REPO:-trusted/devsetup}"
-  DEVSETUP_REF="${DEVSETUP_REF:-main}"
+  # Running via curl | bash — clone (or update) the repo at ~/Work/setup
+  SETUP_CLONE_DIR="$HOME/Work/setup"
+  SETUP_REPO="${SETUP_REPO:-trusted/setup}"
+  SETUP_REF="${SETUP_REF:-main}"
 
-  if [ -d "$DEVSETUP_CLONE_DIR/.git" ]; then
+  if [ -d "$SETUP_CLONE_DIR/.git" ]; then
     # Abort if there are uncommitted changes
-    if ! git -C "$DEVSETUP_CLONE_DIR" diff --quiet HEAD 2>/dev/null; then
-      echo "ERROR: $DEVSETUP_CLONE_DIR has uncommitted changes."
+    if ! git -C "$SETUP_CLONE_DIR" diff --quiet HEAD 2>/dev/null; then
+      echo "ERROR: $SETUP_CLONE_DIR has uncommitted changes."
       echo "Commit or stash them, then re-run setup."
       exit 1
     fi
 
     # Abort if on the wrong branch
-    local_branch="$(git -C "$DEVSETUP_CLONE_DIR" branch --show-current)"
-    if [ "$local_branch" != "$DEVSETUP_REF" ]; then
-      echo "ERROR: $DEVSETUP_CLONE_DIR is on branch '$local_branch', expected '$DEVSETUP_REF'."
-      echo "Switch to $DEVSETUP_REF, then re-run setup."
+    local_branch="$(git -C "$SETUP_CLONE_DIR" branch --show-current)"
+    if [ "$local_branch" != "$SETUP_REF" ]; then
+      echo "ERROR: $SETUP_CLONE_DIR is on branch '$local_branch', expected '$SETUP_REF'."
+      echo "Switch to $SETUP_REF, then re-run setup."
       exit 1
     fi
 
-    echo "Updating devsetup from github.com/$DEVSETUP_REPO ($DEVSETUP_REF)..."
-    git -C "$DEVSETUP_CLONE_DIR" pull --ff-only --quiet
+    echo "Updating setup from github.com/$SETUP_REPO ($SETUP_REF)..."
+    git -C "$SETUP_CLONE_DIR" pull --ff-only --quiet
   else
-    echo "Cloning devsetup from github.com/$DEVSETUP_REPO ($DEVSETUP_REF)..."
+    echo "Cloning setup from github.com/$SETUP_REPO ($SETUP_REF)..."
     mkdir -p "$HOME/Work"
-    git clone "https://github.com/$DEVSETUP_REPO.git" "$DEVSETUP_CLONE_DIR" --quiet
-    git -C "$DEVSETUP_CLONE_DIR" checkout "$DEVSETUP_REF" --quiet
+    git clone "https://github.com/$SETUP_REPO.git" "$SETUP_CLONE_DIR" --quiet
+    git -C "$SETUP_CLONE_DIR" checkout "$SETUP_REF" --quiet
   fi
 
-  SCRIPT_DIR="$DEVSETUP_CLONE_DIR"
+  SCRIPT_DIR="$SETUP_CLONE_DIR"
 fi
 
 # ---------------------------------------------------------------------------
@@ -89,7 +89,7 @@ while [[ $# -gt 0 ]]; do
       shift 2
       ;;
     --help|-h)
-      echo "Trusted Dev Setup"
+      echo "Trusted Setup"
       echo ""
       echo "Usage: setup.sh [OPTIONS]"
       echo ""
@@ -117,7 +117,7 @@ fi
 # ---------------------------------------------------------------------------
 
 echo ""
-echo "= Trusted Dev Setup ="
+echo "= Trusted Setup ="
 echo ""
 echo "  Platform: $OS"
 echo ""
@@ -169,7 +169,7 @@ source "$SCRIPT_DIR/lib/repos_setup.sh"
 # ---------------------------------------------------------------------------
 
 echo ""
-echo "= Trusted Dev Setup Complete ="
+echo "= Trusted Setup Complete ="
 echo ""
 echo "${COLOR_GREEN}Setup finished successfully.${COLOR_RESET}"
 echo ""

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`#!/bin/bash`
`2`	`2`	`#`
`3`		`-# Shared helpers for Trusted Dev Setup.`
	`3`	`+# Shared helpers for Trusted Setup.`
`4`	`4`	`# Sourced by setup.sh — do not execute directly.`
`5`	`5`
`6`	`6`	`# ---------------------------------------------------------------------------`
Original file line number	Diff line number	Diff line change
`@@ -1,12 +1,12 @@`
`1`	`1`	`#!/bin/bash`
`2`	`2`	`#`
`3`		`-# Migration runner for Trusted Dev Setup.`
	`3`	`+# Migration runner for Trusted Setup.`
`4`	`4`	`# Sourced by setup.sh — do not execute directly.`
`5`	`5`	`#`
`6`	`6`	`# Inspired by Omarchy's migration system:`
`7`	`7`	`# https://github.com/basecamp/omarchy/blob/dev/bin/omarchy-migrate`
`8`	`8`
`9`		`-MIGRATION_STATE_DIR="$HOME/.local/state/trusted/devsetup/migrations"`
	`9`	`+MIGRATION_STATE_DIR="$HOME/.local/state/trusted/setup/migrations"`
`10`	`10`
`11`	`11`	`run_migrations() {`
`12`	`12`	`local script_dir="$1"`
Original file line number	Diff line number	Diff line change
`@@ -24,5 +24,5 @@ clone_to_work() {`
`24`	`24`	`fi`
`25`	`25`	`}`
`26`	`26`
`27`		`-clone_to_work "trusted/devsetup" "devsetup"`
	`27`	`+clone_to_work "trusted/setup" "setup"`
`28`	`28`	`clone_to_work "trusted/docs" "docs"`