diff --git a/DONE.md b/DONE.md index af721c8..b6492ca 100644 --- a/DONE.md +++ b/DONE.md @@ -32,6 +32,8 @@ - `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. +- ✅ **Windows scripts entrypoints** + - Added `scripts/install.ps1` and `scripts/install.bat` to keep the Windows workflow inside PowerShell/CMD. ## Version 0.1.0-dev25 (2026-01-22) - Settings Preferences Expansion diff --git a/TODO.md b/TODO.md index d3753d7..3f87b21 100644 --- a/TODO.md +++ b/TODO.md @@ -18,6 +18,8 @@ This file tracks upcoming features, improvements, and known issues. - 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. +- [X] **Windows scripts entrypoints** + - Provide `scripts/install.ps1` and `scripts/install.bat` to avoid Git Bash pop-ups. ## Documentation: Fix Structural Errors diff --git a/docs/INSTALLATION.md b/docs/INSTALLATION.md index 50828b7..c89948a 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 `install.bat` or `install.ps1` on Windows. + - Use `scripts\install.bat` or `scripts\install.ps1` on Windows. ### 🐧 Linux & macOS diff --git a/docs/INSTALL_WINDOWS.md b/docs/INSTALL_WINDOWS.md index 5195087..2cd0aa2 100644 --- a/docs/INSTALL_WINDOWS.md +++ b/docs/INSTALL_WINDOWS.md @@ -16,9 +16,8 @@ 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. Choose one of these entrypoints: - - Double-click `install.bat` (recommended). - - Run `.\install.ps1` from PowerShell. - - Run `scripts\install-windows.ps1` from PowerShell. + - Run `.\scripts\install.bat` (recommended). + - Run `.\scripts\install.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. @@ -30,7 +29,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:** `scripts/install.sh` is for Bash shells. From PowerShell, use `install.ps1` to avoid Git Bash popping up. +> **Note:** On Windows, use `scripts\install.ps1` or `scripts\install.bat`. Running `scripts\install.sh` from PowerShell will open Git Bash. --- diff --git a/scripts/install.bat b/scripts/install.bat new file mode 100644 index 0000000..a2364c7 --- /dev/null +++ b/scripts/install.bat @@ -0,0 +1,12 @@ +@echo off +setlocal +chcp 65001 >nul +title VideoTools Windows Installation + +echo ======================================================== +echo VideoTools Windows Installation +echo ======================================================== +echo. + +powershell -NoProfile -ExecutionPolicy Bypass -File "%~dp0install.ps1" +exit /b %errorlevel% diff --git a/scripts/install.ps1 b/scripts/install.ps1 new file mode 100644 index 0000000..659ea02 --- /dev/null +++ b/scripts/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\install-deps-windows.ps1" +exit $LASTEXITCODE diff --git a/scripts/install.sh b/scripts/install.sh index 9d0cf43..88ab273 100755 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -105,17 +105,11 @@ echo "" # Windows uses a dedicated installer to avoid Git Bash/PowerShell chaining. if [ "$IS_WINDOWS" = true ]; then - 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 + echo -e "${YELLOW}NOTICE:${NC} Windows detected." + echo "Run one of these from PowerShell or CMD instead:" + echo " - $PROJECT_ROOT\\scripts\\install.ps1" + echo " - $PROJECT_ROOT\\scripts\\install.bat" + exit 0 fi # Step 1: Check if Go is installed