Merge pull request #42 from outis1one/claude/dazzling-mendel-J4fi4

Claude/dazzling mendel j4fi4

README.md

@@ -5,20 +5,35 @@ install exactly what you need — interactively or by name.
 
 ## Quick start on a fresh box
 
+**Public repo — paste on any new box:**
 ```bash
 curl -fsSL https://raw.githubusercontent.com/outis1one/ubuntu-post-install/main/bootstrap.sh | sudo bash
 ```
 
-That installs git (if missing), clones the repo to `~/ubuntu-post-install`,
+**USB thumb drive — works for public or private repos:**
-and drops you into the interactive wizard.
 
-If you already have git:
+Prepare the USB once on any machine (no git required):
+1. Go to the repo on GitHub → green **Code** button → **Download ZIP**
+2. Unzip it — you'll get a folder called `ubuntu-post-install-main`
+3. Copy that folder to your USB drive
 
+On every new box:
+1. Plug in the USB — it opens in the file manager
+2. Navigate into the `ubuntu-post-install-main` folder
+3. **Either:**
+   - Right-click inside the folder → **Open in Terminal** → type `bash bootstrap.sh`
+   - **Or** double-click `bootstrap.sh` → if prompted, choose **Run in Terminal**
+
+The script asks for your password if needed. It detects it is running from
+inside the repo, copies everything to `~/ubuntu-post-install`, then launches
+the wizard — the USB can be unplugged once setup starts.
+
+**Private repo — PAT (alternative):**
 ```bash
-git clone https://github.com/outis1one/ubuntu-post-install.git
+sudo bash bootstrap.sh --pat ghp_xxxxxxxxxxxxxxxxxxxx
-cd ubuntu-post-install
-sudo ./setup.sh
 ```
+Use a fine-grained read-only PAT scoped to just this repo (Contents: Read).
+The PAT is stripped from the stored remote URL after cloning.
 
 ## Usage
 

bootstrap.sh

@@ -1,23 +1,44 @@
 #!/bin/bash
 # bootstrap.sh — get and run ubuntu-post-install on a fresh system.
 #
-# One command to paste into a new Ubuntu box:
+# THREE ways to use this:
-#   curl -fsSL https://raw.githubusercontent.com/outis1one/ubuntu-post-install/main/bootstrap.sh | sudo bash
 #
-# What it does:
+#  1. Public repo — paste on any new box (internet required):
-#   1. Installs git if missing (the only hard dependency)
+#       curl -fsSL https://raw.githubusercontent.com/outis1one/ubuntu-post-install/main/bootstrap.sh | sudo bash
-#   2. Clones (or updates) the repo to ~/ubuntu-post-install
+#
-#   3. Launches the interactive setup wizard
+#  2. Private repo — copy just this file, supply a fine-grained read-only PAT:
+#       sudo bash bootstrap.sh --pat ghp_xxxxxxxxxxxxxxxxxxxx
+#
+#  3. USB / offline — copy the WHOLE REPO to a thumb drive, run from there
+#     (no auth, no internet needed for the scripts themselves):
+#       sudo bash /media/user/DRIVE/ubuntu-post-install/bootstrap.sh
+#
+# Option 3 is the recommended approach for private repos: clone once on a
+# connected machine, put the directory on a USB drive, done.
 set -euo pipefail
 
+# Self-elevate: if double-clicked or run without sudo, ask for password.
+if [ "$(id -u)" -ne 0 ]; then
+    exec sudo bash "$0" "$@"
+fi
+
 REPO_URL="https://github.com/outis1one/ubuntu-post-install.git"
-DEST="${HOME:-/root}/ubuntu-post-install"
 
 # Resolve actual user home when running under sudo
+ACTUAL_HOME="${HOME:-/root}"
 if [ -n "${SUDO_USER:-}" ]; then
     ACTUAL_HOME="$(getent passwd "$SUDO_USER" | cut -d: -f6)"
-    DEST="$ACTUAL_HOME/ubuntu-post-install"
 fi
+DEST="$ACTUAL_HOME/ubuntu-post-install"
+
+# Parse --pat flag
+PAT=""
+for arg in "$@"; do
+    case "$arg" in
+        --pat) shift; PAT="${1:-}" ;;
+        --pat=*) PAT="${arg#--pat=}" ;;
+    esac
+done
 
 echo ""
 echo "╔══════════════════════════════════════════════════════════════╗"
@@ -25,23 +46,49 @@ echo "║  ubuntu-post-install  ·  bootstrap                          ║"
 echo "╚══════════════════════════════════════════════════════════════╝"
 echo ""
 
-# 1) Ensure git is available
+# ── Option 3: already running from inside the repo ───────────────────────────
+# If setup.sh is sitting next to this script, we have everything we need.
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" 2>/dev/null && pwd || echo "")"
+if [ -f "${SCRIPT_DIR}/setup.sh" ]; then
+    echo "  Running from local copy at $SCRIPT_DIR"
+    echo "  (No git or internet needed)"
+    echo ""
+    # Copy to home so the install persists after the USB is removed
+    if [ "$SCRIPT_DIR" != "$DEST" ]; then
+        echo "  Copying to $DEST for future use..."
+        cp -r "$SCRIPT_DIR" "$DEST" 2>/dev/null \
+            && chown -R "${SUDO_USER:-$(id -un)}:" "$DEST" 2>/dev/null || true
+        echo ""
+    fi
+    exec bash "${SCRIPT_DIR}/setup.sh"
+fi
+
+# ── Options 1 & 2: clone from GitHub ─────────────────────────────────────────
 if ! command -v git >/dev/null 2>&1; then
-    echo "Installing git..."
+    echo "  Installing git..."
     apt-get update -qq && apt-get install -y git
 fi
 
-# 2) Clone or update
+# Build clone URL (with PAT if supplied)
+CLONE_URL="$REPO_URL"
+if [ -n "$PAT" ]; then
+    CLONE_URL="https://${PAT}@github.com/${REPO_URL#https://github.com/}"
+fi
+
 if [ -d "$DEST/.git" ]; then
-    echo "Repo already exists at $DEST — pulling latest..."
+    echo "  Repo already exists at $DEST — pulling latest..."
     git -C "$DEST" pull --ff-only || echo "  (pull failed — continuing with existing version)"
 else
-    echo "Cloning to $DEST ..."
+    echo "  Cloning to $DEST ..."
-    git clone "$REPO_URL" "$DEST"
+    git clone "$CLONE_URL" "$DEST"
+    # Remove PAT from stored remote URL so it isn't saved in plain text
+    if [ -n "$PAT" ]; then
+        git -C "$DEST" remote set-url origin "$REPO_URL"
+    fi
 fi
 
 echo ""
-echo "Launching setup..."
+echo "  Launching setup..."
 echo ""
 
 exec bash "$DEST/setup.sh"