diff --git a/DONE.md b/DONE.md index 3f6ad63..664c2ee 100644 --- a/DONE.md +++ b/DONE.md @@ -28,6 +28,8 @@ - `install.sh` now delegates to the Windows installer to avoid mixed-shell prompts. - ✅ **Windows installer entrypoint** - Added `install-windows.ps1` and made `install.sh` Windows-safe with a clear handoff message. +- ✅ **Git Bash Windows handoff** + - `install.sh` now runs the Windows installer in the same terminal via `winpty` when available. ## Version 0.1.0-dev25 (2026-01-22) - Settings Preferences Expansion diff --git a/TODO.md b/TODO.md index 3d72f72..49387f2 100644 --- a/TODO.md +++ b/TODO.md @@ -14,6 +14,8 @@ This file tracks upcoming features, improvements, and known issues. - Route Windows to the dedicated installer to avoid mixed-shell prompts. - [X] **Windows installer entrypoint** - Provide a PowerShell entrypoint and direct Windows users to it from install.sh. +- [X] **Git Bash handoff** + - Keep Windows installs in the same Git Bash terminal using `winpty` when available. ## Documentation: Fix Structural Errors diff --git a/docs/INSTALL_WINDOWS.md b/docs/INSTALL_WINDOWS.md index 114246d..a5ee188 100644 --- a/docs/INSTALL_WINDOWS.md +++ b/docs/INSTALL_WINDOWS.md @@ -28,7 +28,7 @@ If you haven't already, download the project files as a ZIP and extract them to Once the script finishes, you can run the application by double-clicking `run.bat` in the main project folder. -> **Note:** On Windows, use `setup-windows.bat` or `scripts\install-windows.ps1` instead of `scripts/install.sh` to avoid mixed-shell prompts. +> **Note:** If you run `scripts/install.sh` from Git Bash, it will stay in the same terminal and hand off to PowerShell automatically. --- diff --git a/scripts/install.sh b/scripts/install.sh index bea3023..9d0cf43 100755 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -105,11 +105,17 @@ echo "" # Windows uses a dedicated installer to avoid Git Bash/PowerShell chaining. if [ "$IS_WINDOWS" = true ]; then - echo -e "${YELLOW}NOTICE:${NC} Windows detected." - echo "Please run one of the dedicated Windows installers instead:" - echo " - $PROJECT_ROOT\\scripts\\setup-windows.bat" - echo " - $PROJECT_ROOT\\scripts\\install-windows.ps1" - exit 0 + if command -v winpty &> /dev/null; then + winpty powershell.exe -NoProfile -ExecutionPolicy Bypass -File "$PROJECT_ROOT/scripts/install-deps-windows.ps1" + exit $? + fi + if command -v powershell.exe &> /dev/null; then + powershell.exe -NoProfile -ExecutionPolicy Bypass -File "$PROJECT_ROOT/scripts/install-deps-windows.ps1" + exit $? + fi + echo -e "${RED}[ERROR]${NC} powershell.exe not found." + echo "Please run: $PROJECT_ROOT\\scripts\\setup-windows.bat" + exit 1 fi # Step 1: Check if Go is installed