Update DeployWorkstation.bat

Author: Pnwcomputers

DeployWorkstation.bat

@@ -1,111 +1,136 @@
 @echo off
 REM ========================================================
-REM  DeployWorkstation-Launcher.bat
-REM  Ensures elevation, then runs DeployWorkstation.ps1
-REM  Compatible with the optimized PowerShell script
+REM  DeployWorkstation.bat
+REM  Launcher for DeployWorkstation.ps1
+REM  Version 5.1 – PNWC Edition
 REM ========================================================
 
 setlocal enabledelayedexpansion
 
 echo.
-echo ===== DeployWorkstation Launcher =====
+echo ===== DeployWorkstation Launcher v5.1 =====
 echo.
 
-REM 1) Check if we're already elevated
+REM --------------------------------------------------------
+REM  1) Elevation check
+REM     Re-launch this .bat elevated if not already admin.
+REM --------------------------------------------------------
 net session >nul 2>&1
 if %errorlevel% neq 0 (
     echo Requesting administrative privileges...
-    echo Please click "Yes" in the UAC prompt that appears.
+    echo Please click "Yes" in the UAC prompt.
     echo.
-    
-    REM Re-launch this batch file with elevation
     powershell.exe -NoProfile -Command ^
-      "Start-Process -FilePath '%~f0' -Verb RunAs -Wait"
-    
-    REM Exit the non-elevated instance
+        "Start-Process -FilePath '%~f0' -Verb RunAs -Wait"
     exit /b
 )
 
-REM 2) We're now elevated - show confirmation
-echo Administrative privileges confirmed.
-echo Current directory: %~dp0
+echo [OK] Running as Administrator.
 echo.
 
-REM 3) Change to script directory
+REM --------------------------------------------------------
+REM  2) Change to the directory containing this .bat
+REM --------------------------------------------------------
 pushd "%~dp0"
 
-REM 4) Check if PowerShell script exists
+REM --------------------------------------------------------
+REM  3) Verify the PowerShell script is present
+REM --------------------------------------------------------
 if not exist "DeployWorkstation.ps1" (
-    echo ERROR: DeployWorkstation.ps1 not found in current directory!
-    echo Expected location: %~dp0DeployWorkstation.ps1
+    echo [ERROR] DeployWorkstation.ps1 not found.
+    echo         Expected: %~dp0DeployWorkstation.ps1
     echo.
     goto :error_exit
 )
 
-REM 5) Show options menu
-echo Available options:
-echo   1. Full deployment (remove bloatware + install apps)
+REM --------------------------------------------------------
+REM  4) Menu
+REM --------------------------------------------------------
+:menu
+echo Select deployment mode:
+echo.
+echo   1. Full deployment  (remove bloatware + install apps + configure system)
 echo   2. Remove bloatware only
 echo   3. Install apps only
-echo   4. Exit
+echo   4. System configuration only
+echo   5. Exit
 echo.
-set /p choice="Enter your choice (1-4): "
+set "choice="
+set /p choice="Enter choice (1-5): "
 
-REM 6) Set PowerShell parameters based on choice
 set "ps_params="
+
 if "%choice%"=="1" (
-    echo Running full deployment...
-    set "ps_params="
+    echo.
+    echo [*] Full deployment selected.
 ) else if "%choice%"=="2" (
-    echo Running bloatware removal only...
-    set "ps_params=-SkipAppInstall"
+    echo.
+    echo [*] Bloatware removal only.
+    set "ps_params=-SkipAppInstall -SkipSystemConfig"
 ) else if "%choice%"=="3" (
-    echo Running app installation only...
-    set "ps_params=-SkipBloatwareRemoval"
+    echo.
+    echo [*] App installation only.
+    set "ps_params=-SkipBloatwareRemoval -SkipSystemConfig"
 ) else if "%choice%"=="4" (
-    echo Exiting...
+    echo.
+    echo [*] System configuration only.
+    set "ps_params=-SkipBloatwareRemoval -SkipAppInstall"
+) else if "%choice%"=="5" (
+    echo Exiting.
     goto :normal_exit
 ) else (
-    echo Invalid choice. Running full deployment...
-    set "ps_params="
+    echo [!] Invalid choice - please try again.
+    echo.
+    goto :menu
 )
 
+REM --------------------------------------------------------
+REM  5) Show what will run, then launch
+REM --------------------------------------------------------
+if "!ps_params!"=="" (
+    echo     Parameters : (none - full run)
+) else (
+    echo     Parameters : !ps_params!
+)
 echo.
-echo Starting PowerShell script with Windows PowerShell 5.1...
-echo Parameters: %ps_params%
+echo Starting Windows PowerShell 5.1...
 echo.
 
-REM 7) Run the PowerShell script with proper parameters
-if "%ps_params%"=="" (
+if "!ps_params!"=="" (
     powershell.exe -NoProfile -ExecutionPolicy Bypass -File "DeployWorkstation.ps1"
 ) else (
-    powershell.exe -NoProfile -ExecutionPolicy Bypass -File "DeployWorkstation.ps1" %ps_params%
+    powershell.exe -NoProfile -ExecutionPolicy Bypass -File "DeployWorkstation.ps1" !ps_params!
 )
 
-REM 8) Check exit code and report results
-if %errorlevel% equ 0 (
-    echo.
+REM Capture exit code immediately before anything can overwrite it
+set "ps_exit=%errorlevel%"
+
+REM --------------------------------------------------------
+REM  6) Result
+REM --------------------------------------------------------
+echo.
+if "%ps_exit%"=="0" (
     echo ===== Deployment completed successfully =====
 ) else (
-    echo.
-    echo ===== Deployment completed with errors =====
-    echo Exit code: %errorlevel%
-    echo Check the log file for details.
+    echo ===== Deployment finished with errors =====
+    echo     Exit code : %ps_exit%
+    echo     Check DeployWorkstation.log in this folder for details.
 )
 
 goto :normal_exit
 
+REM --------------------------------------------------------
 :error_exit
 echo.
-echo ===== Deployment failed =====
+echo ===== Launch aborted =====
 popd
 pause
 exit /b 1
 
+REM --------------------------------------------------------
 :normal_exit
-REM 9) Return to original directory and pause
 popd
 echo.
-echo Press any key to exit...
+echo Press any key to close...
 pause >nul
-exit /b 0
+exit /b 0