From 49becf9c2d32690ba5ed0eb20433c5926a90db8d Mon Sep 17 00:00:00 2001 From: VideoTools CI Date: Fri, 23 Jan 2026 06:02:42 -0500 Subject: [PATCH] fix(install): add windows root entrypoints --- DONE.md | 2 ++ TODO.md | 2 ++ docs/INSTALLATION.md | 2 +- docs/INSTALL_WINDOWS.md | 8 +++++--- install.bat | 12 ++++++++++++ install.ps1 | 9 +++++++++ 6 files changed, 31 insertions(+), 4 deletions(-) create mode 100644 install.bat create mode 100644 install.ps1 diff --git a/DONE.md b/DONE.md index 664c2ee..af721c8 100644 --- a/DONE.md +++ b/DONE.md @@ -30,6 +30,8 @@ - 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. +- ✅ **Windows root entrypoints** + - Added `install.bat` and `install.ps1` to avoid Git Bash popping up from PowerShell. ## Version 0.1.0-dev25 (2026-01-22) - Settings Preferences Expansion diff --git a/TODO.md b/TODO.md index 49387f2..d3753d7 100644 --- a/TODO.md +++ b/TODO.md @@ -16,6 +16,8 @@ This file tracks upcoming features, improvements, and known issues. - 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. +- [X] **Windows root entrypoints** + - Provide `install.bat` and `install.ps1` for PowerShell-first installs. ## Documentation: Fix Structural Errors diff --git a/docs/INSTALLATION.md b/docs/INSTALLATION.md index 4496996..50828b7 100644 --- a/docs/INSTALLATION.md +++ b/docs/INSTALLATION.md @@ -11,7 +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. + - Use `install.bat` or `install.ps1` on Windows. ### 🐧 Linux & macOS diff --git a/docs/INSTALL_WINDOWS.md b/docs/INSTALL_WINDOWS.md index a5ee188..5195087 100644 --- a/docs/INSTALL_WINDOWS.md +++ b/docs/INSTALL_WINDOWS.md @@ -15,8 +15,10 @@ If you haven't already, download the project files as a ZIP and extract them to ### Step 2: Run the Setup Script 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. +2. Choose one of these entrypoints: + - Double-click `install.bat` (recommended). + - Run `.\install.ps1` from PowerShell. + - 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. @@ -28,7 +30,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:** If you run `scripts/install.sh` from Git Bash, it will stay in the same terminal and hand off to PowerShell automatically. +> **Note:** `scripts/install.sh` is for Bash shells. From PowerShell, use `install.ps1` to avoid Git Bash popping up. --- diff --git a/install.bat b/install.bat new file mode 100644 index 0000000..b6ea733 --- /dev/null +++ b/install.bat @@ -0,0 +1,12 @@ +@echo off +setlocal +chcp 65001 >nul +title VideoTools Windows Installation + +echo ======================================================== +echo VideoTools Windows Installation +echo ======================================================== +echo. + +call "%~dp0scripts\setup-windows.bat" +exit /b %errorlevel% diff --git a/install.ps1 b/install.ps1 new file mode 100644 index 0000000..9d86364 --- /dev/null +++ b/install.ps1 @@ -0,0 +1,9 @@ +param() + +Write-Host "===============================================================" -ForegroundColor Cyan +Write-Host " VideoTools Windows Installation" -ForegroundColor Cyan +Write-Host "===============================================================" -ForegroundColor Cyan +Write-Host "" + +& "$PSScriptRoot\scripts\install-deps-windows.ps1" +exit $LASTEXITCODE