macsetup 0.1.0__tar.gz → 0.1.1__tar.gz

{macsetup-0.1.0 → macsetup-0.1.1}/.github/workflows/ci.yml

@@ -117,9 +117,12 @@ jobs:
         run: |
           sb=$(mktemp -d)
           for run in 1 2; do
-            HOME="$sb" MACSETUP_SOURCE="$PWD" bash -s -- plan --profile minimal < install.sh
+            HOME="$sb" SHELL=/bin/zsh MACSETUP_SOURCE="$PWD" \
+              bash -s -- plan --profile minimal < install.sh
           done
           test -x "$sb/.local/bin/macsetup"
+          # A new terminal has to find it too, not just the installer's shell.
+          env -i HOME="$sb" PATH=/usr/bin:/bin zsh -l -c 'command -v macsetup'
 
       # Re-applying a converged machine must be a no-op, not a second write.
       - name: applying twice is idempotent

{macsetup-0.1.0 → macsetup-0.1.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: macsetup
-Version: 0.1.0
+Version: 0.1.1
 Summary: Declarative provisioning for macOS: packages and dotfiles, with a preview
 Project-URL: Homepage, https://github.com/neosergio/macsetup
 Project-URL: Issues, https://github.com/neosergio/macsetup/issues

{macsetup-0.1.0 → macsetup-0.1.1}/install.sh

@@ -34,10 +34,23 @@ fi
 
 # `curl | bash` feeds the script itself on stdin, so anything that prompts has
 # to read the terminal explicitly -- otherwise it would swallow the rest of
-# this file as its answers.
-if { : </dev/tty; } 2>/dev/null; then have_tty=1; else have_tty=0; fi
+# this file as its answers. That means the terminal's real device, not
+# /dev/tty: macOS kqueue rejects /dev/tty with EINVAL, and the wizard's event
+# loop (prompt_toolkit on asyncio) dies on it before asking anything.
+tty_dev=""
+if [[ ! -t 0 ]]; then
+  tty_dev="/dev/$(ps -o tty= -p $$ | tr -d ' ')"
+  { : <"$tty_dev"; } 2>/dev/null || tty_dev=""
+fi
+if [[ -t 0 || -n $tty_dev ]]; then have_tty=1; else have_tty=0; fi
 interactive() {
-  if ((have_tty)); then "$@" </dev/tty; else "$@" </dev/null; fi
+  if [[ -t 0 ]]; then
+    "$@"
+  elif [[ -n $tty_dev ]]; then
+    "$@" <"$tty_dev"
+  else
+    "$@" </dev/null
+  fi
 }
 
 find_brew() {
@@ -88,11 +101,13 @@ main() {
     brew install uv
   fi
 
-  # On PATH before the install, or uv warns about a dir we fix right after.
+  # Persist uv's bin dir for future shells, then add it to this one -- in that
+  # order: update-shell does nothing when the dir is already on PATH, which
+  # left `macsetup: command not found` in every new terminal.
+  uv tool update-shell >/dev/null 2>&1 || true
   PATH="$(uv tool dir --bin):$PATH"
   say "Installing macsetup"
   uv tool install --upgrade "$MACSETUP_SOURCE"
-  uv tool update-shell >/dev/null 2>&1 || true
 
   if (($#)); then
     say "Running: macsetup $*"

{macsetup-0.1.0 → macsetup-0.1.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "macsetup"
-version = "0.1.0"
+version = "0.1.1"
 description = "Declarative provisioning for macOS: packages and dotfiles, with a preview"
 readme = "README.md"
 requires-python = ">=3.12"

{macsetup-0.1.0 → macsetup-0.1.1}/src/macsetup/cli.py

@@ -244,7 +244,9 @@ def _run_wizard(catalog: Catalog, current: MachineState | None) -> MachineState:
         console.print("[yellow]Cancelled.[/] Nothing was saved.")
         raise typer.Exit(130) from None
     except (OSError, EOFError) as exc:
-        console.print(f"[red]Could not read from the terminal:[/] {exc}")
+        # repr, not str: EOFError stringifies to nothing, which leaves the
+        # message ending in a bare colon.
+        console.print(f"[red]Could not read from the terminal:[/] {exc!r}")
         raise typer.Exit(2) from exc
 
     # Enter on an untouched checkbox selects nothing, which is a legitimate

{macsetup-0.1.0 → macsetup-0.1.1}/uv.lock

@@ -1,5 +1,5 @@
 version = 1
-revision = 5
+revision = 3
 requires-python = ">=3.12"
 
 [[package]]
@@ -52,7 +52,7 @@ wheels = [
 
 [[package]]
 name = "macsetup"
-version = "0.1.0"
+version = "0.1.1"
 source = { editable = "." }
 dependencies = [
     { name = "jinja2" },