From 91aac9005af2e7d5532b94eab4271381fd065997 Mon Sep 17 00:00:00 2001 From: VideoTools CI Date: Fri, 23 Jan 2026 05:57:56 -0500 Subject: [PATCH] fix(install): add windows entrypoint --- DONE.md | 2 ++ TODO.md | 2 ++ docs/INSTALLATION.md | 1 + docs/INSTALL_WINDOWS.md | 3 ++- scripts/install-windows.ps1 | 9 +++++++++ scripts/install.sh | 12 +++++------- 6 files changed, 21 insertions(+), 8 deletions(-) create mode 100644 scripts/install-windows.ps1 diff --git a/DONE.md b/DONE.md index 97b5bd5..3f6ad63 100644 --- a/DONE.md +++ b/DONE.md @@ -26,6 +26,8 @@ - Removed the Go prompt in `install.sh`; missing Go is now installed automatically. - ✅ **Windows install workflow split** - `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. ## Version 0.1.0-dev25 (2026-01-22) - Settings Preferences Expansion diff --git a/TODO.md b/TODO.md index caa9782..3d72f72 100644 --- a/TODO.md +++ b/TODO.md @@ -12,6 +12,8 @@ This file tracks upcoming features, improvements, and known issues. - Skip prompting for Go and install automatically when missing. - [X] **Windows install workflow split** - 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. ## Documentation: Fix Structural Errors diff --git a/docs/INSTALLATION.md b/docs/INSTALLATION.md index 0b82875..4496996 100644 --- a/docs/INSTALLATION.md +++ b/docs/INSTALLATION.md @@ -11,6 +11,7 @@ Welcome to the VideoTools installation guide. Please select your operating syste For Windows 10 and 11, please follow our detailed, step-by-step guide. It covers both automated and manual setup. - **[➡️ View Windows Installation Guide](./INSTALL_WINDOWS.md)** + - Use `setup-windows.bat` or `scripts\install-windows.ps1` on Windows. ### 🐧 Linux & macOS diff --git a/docs/INSTALL_WINDOWS.md b/docs/INSTALL_WINDOWS.md index 9571531..114246d 100644 --- a/docs/INSTALL_WINDOWS.md +++ b/docs/INSTALL_WINDOWS.md @@ -16,6 +16,7 @@ If you haven't already, download the project files as a ZIP and extract them to 1. Open the project folder in File Explorer. 2. Find and double-click on `setup-windows.bat`. + - Alternatively, run `scripts\install-windows.ps1` from PowerShell. 3. A terminal window will open and run the PowerShell setup script. This will: * **Download FFmpeg:** The script automatically fetches the latest stable version of FFmpeg, which is required for all video operations. * **Install Dependencies:** It places the necessary files in the correct directories. @@ -27,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` instead of `scripts/install.sh` to avoid mixed-shell prompts. +> **Note:** On Windows, use `setup-windows.bat` or `scripts\install-windows.ps1` instead of `scripts/install.sh` to avoid mixed-shell prompts. --- diff --git a/scripts/install-windows.ps1 b/scripts/install-windows.ps1 new file mode 100644 index 0000000..659ea02 --- /dev/null +++ b/scripts/install-windows.ps1 @@ -0,0 +1,9 @@ +param() + +Write-Host "===============================================================" -ForegroundColor Cyan +Write-Host " VideoTools Windows Installation" -ForegroundColor Cyan +Write-Host "===============================================================" -ForegroundColor Cyan +Write-Host "" + +& "$PSScriptRoot\install-deps-windows.ps1" +exit $LASTEXITCODE diff --git a/scripts/install.sh b/scripts/install.sh index 3da793a..bea3023 100755 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -105,13 +105,11 @@ echo "" # Windows uses a dedicated installer to avoid Git Bash/PowerShell chaining. if [ "$IS_WINDOWS" = true ]; then - 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 + 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 fi # Step 1: Check if Go is installed