Skip to content

Commit 0b13e22

Browse files
PnwcomputersPnwcomputers
authored
Version5.1 (#12)
* Update DeployWorkstation.ps1 to version 4.0 (#8) * Update DeployWorkstation.bat for version 4.0 * Fix syntax error in DeployWorkstation.ps1 * Revise roadmap for upcoming versions and features Updated roadmap to reflect new versioning and features. * Update DeployWorkstation.ps1 * Fix roadmap entry for Configuration Management Integration * Update future enhancements in README Removed 'Real-time Progress' and 'Multi-language Support' from future enhancements. * Delete CONTRIBUTING.md * Rename CHANGELOG.md to .github/CHANGELOG.md * Rename generate_changelog.py to Logs/generate_changelog.py * Rename FAQ.md to docs/FAQ.md * Delete .gitignore * Update print statement from 'Hello' to 'Goodbye' * Refactor logging messages for winget management * Improve language resolution and HTML output formatting Refactor language resolution logic and update OS info display. * Fix exit command in DeployWorkstation.bat * Update README title to Version5 * Add roadmap item for improved app removal and installation * Fix version heading typo in README.md * Update README with new features for version 5 Added new features and roadmap for version 5. * Revise 'What's New' section in README Updated the 'What's New' section for Version 5. * Update security contact email in README * Refactor path handling for script root and logging * Fix formatting of invalid choice message in batch file * Update version from 4.0 to 6.0 in batch file * Add newline at end of DeployWorkstation.ps1 Fix missing newline at the end of the file. * Fix duration calculation to use Floor method * Update version number in DeployWorkstation.bat * Update version number from 6.0 to 5.0 * Update DeployWorkstation Launcher version to v5.0 * Update version number from 6.0 to 5.0 * Update DeployWorkstation script to version 5.1 * Update version from 5.0 to 5.1 in DeployWorkstation.bat * Fix exit command formatting in DeployWorkstation.bat * Fix network error codes and improve logging * Update README version from 5 to 5.1 * Fix exit command in DeployWorkstation.bat * Fix exit command in DeployWorkstation.bat * Fix exit command formatting in DeployWorkstation.bat * Update DeployWorkstation.bat (#9) * Change default case output to 'Unknown' * Fix exit command formatting in DeployWorkstation.bat * Add newline at end of DeployWorkstation.ps1 Fix missing newline at end of file. * Replace 'Hello World' with 'Goodbye World' * Delete DeployWorkstation.bat * Rename DeployWorkstaton.bat to DeployWorkstation.bat * Add newline at end of DeployWorkstation.ps1 Fix missing newline at end of file. * Update print statement from 'Hello' to 'Goodbye' * Add newline at end of DeployWorkstation.ps1 Fix missing newline at end of file. * Fix OS edition detection parse error in PS5.1 report (#10) * Add cmd compatibility launcher and harden validation tests (#11) * Delete DeployWorkstation.cmd * Upgrade DeployWorkstation.bat to version 5.2 Updated the DeployWorkstation.bat script to version 5.2, enhancing error handling and ensuring proper execution of the PowerShell script. * Update print statement from 'Hello' to 'Goodbye' * Update launcher version from v5.2 to v5.1 * Upgrade DeployWorkstation Launcher to v6.0 Updated launcher version and improved error messages. * Change 'Hello World' to 'Goodbye World' * Change launcher version and enhance error messages Updated the launcher version from 6.0 to 5.1 and improved error handling messages. * Update fmt.Println message from 'Hello' to 'Goodbye' * Update print statement from 'Hello' to 'Goodbye' * Refactor DeployWorkstation.bat for better execution flow Updated the script to improve error handling and parameter passing. * Fix exit command in DeployWorkstation.bat * Add newline at end of DeployWorkstation.ps1 Fix missing newline at end of DeployWorkstation.ps1 * Update version comment in DeployWorkstation.bat * Update version comment in DeployWorkstation.ps1 * Optimize osEdition assignment and remove update date Removed unnecessary line about update date and optimized the osEdition assignment. * Update version comment in DeployWorkstation.bat * Handle Winget exit codes for uninstall operations * Refactor error handling in DeployWorkstation.ps1 * Enhance error handling and logging in DeployWorkstation Added a new known failure code for missing packages in winget source and adjusted logging for cleaner output. * Fix syntax for known failure messages in DeployWorkstation.ps1 * Refactor error handling for installation failures * Implement script integrity verification Added integrity verification for DeployWorkstation.ps1. * Refactor comments and improve script readability * Update version to 5.1.4.1.2026 in DeployWorkstation.ps1 * Refactor DeployWorkstation.bat for clarity and updates * Update version comment in DeployWorkstation.bat
1 parent ba9399b commit 0b13e22

8 files changed

Lines changed: 1269 additions & 384 deletions

File tree

CHANGELOG.md renamed to .github/CHANGELOG.md

File renamed without changes.

‎CONTRIBUTING.md‎

Lines changed: 0 additions & 96 deletions
This file was deleted.

‎DeployWorkstation.bat‎

Lines changed: 42 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,44 @@
11
@echo off
2+
title DeployWorkstation Launcher v5.1
23
REM ========================================================
3-
REM DeployWorkstation-Launcher.bat
4-
REM Ensures elevation, then runs DeployWorkstation.ps1
5-
REM Compatible with the optimized PowerShell script
4+
REM DeployWorkstation.bat - Launcher for DeployWorkstation.ps1
5+
REM Version 5.1 - PNWC Edition 4.1.2026
66
REM ========================================================
77

88
setlocal enabledelayedexpansion
99

1010
echo.
11-
echo ===== DeployWorkstation Launcher =====
11+
echo ===== DeployWorkstation Launcher v5.1 =====
1212
echo.
1313

1414
REM 1) Check if we're already elevated
1515

1616
net session >nul 2>&1
1717
if %errorlevel% neq 0 (
1818
echo Requesting administrative privileges...
19-
echo Please click "Yes" in the UAC prompt that appears.
19+
echo Please accept the UAC prompt.
2020
echo.
21-
22-
REM Re-launch this batch file with elevation
23-
powershell.exe -NoProfile -Command ^
24-
"Start-Process -FilePath '%~f0' -Verb RunAs -Wait"
25-
26-
REM Exit the non-elevated instance
27-
exit /b
21+
powershell.exe -NoProfile -Command "Start-Process cmd.exe -ArgumentList '/c "%~f0"' -Verb RunAs"
22+
exit /b 0
2823
)
2924

30-
REM 2) We're now elevated - show confirmation
31-
echo Administrative privileges confirmed.
32-
echo Current directory: %~dp0
25+
echo [OK] Running as Administrator.
3326
echo.
3427

35-
REM 3) Change to script directory
28+
REM --------------------------------------------------------
29+
REM Change to the directory containing this .bat
30+
REM --------------------------------------------------------
3631
pushd "%~dp0"
3732

3833
REM 4) Check if PowerShell script exists
3934

4035
if not exist "DeployWorkstation.ps1" (
41-
echo ERROR: DeployWorkstation.ps1 not found in current directory!
42-
echo Expected location: %~dp0DeployWorkstation.ps1
36+
echo [ERROR] DeployWorkstation.ps1 not found in:
37+
echo %~dp0
4338
echo.
39+
echo Both files must be in the same folder.
40+
echo.
41+
pause
4442
goto :error_exit
4543
)
4644

@@ -56,7 +54,8 @@ echo 3. Install apps only
5654
echo 4. Exit
5755

5856
echo.
59-
set /p choice="Enter your choice (1-4): "
57+
set "choice="
58+
set /p choice="Enter choice (1-5): "
6059

6160

6261
REM 6) Set PowerShell parameters based on choice
@@ -75,23 +74,34 @@ if "%choice%"=="1" (
7574
set "ps_params=-SkipBloatwareRemoval"
7675

7776
) else if "%choice%"=="4" (
78-
echo Exiting...
77+
echo.
78+
echo [*] System configuration only.
79+
set "ps_params=-SkipBloatwareRemoval -SkipAppInstall"
80+
) else if "%choice%"=="5" (
81+
echo Exiting.
7982
goto :normal_exit
8083
) else (
81-
echo Invalid choice. Running full deployment...
82-
set "ps_params="
84+
echo [!] Invalid choice - please try again.
85+
echo.
86+
goto :menu
8387
)
8488

89+
REM --------------------------------------------------------
90+
REM Launch
91+
REM --------------------------------------------------------
92+
if "!ps_params!"=="" (
93+
echo Parameters : (none - full run)
94+
) else (
95+
echo Parameters : !ps_params!
96+
)
8597
echo.
86-
echo Starting PowerShell script with Windows PowerShell 5.1...
87-
echo Parameters: %ps_params%
98+
echo Starting Windows PowerShell 5.1...
8899
echo.
89100

90-
REM 7) Run the PowerShell script with proper parameters
91-
if "%ps_params%"=="" (
101+
if "!ps_params!"=="" (
92102
powershell.exe -NoProfile -ExecutionPolicy Bypass -File "DeployWorkstation.ps1"
93103
) else (
94-
powershell.exe -NoProfile -ExecutionPolicy Bypass -File "DeployWorkstation.ps1" %ps_params%
104+
powershell.exe -NoProfile -ExecutionPolicy Bypass -File "DeployWorkstation.ps1" !ps_params!
95105
)
96106

97107
REM 8) Check exit code and report results
@@ -100,25 +110,23 @@ if %errorlevel% equ 0 (
100110

101111
echo ===== Deployment completed successfully =====
102112
) else (
103-
echo.
104-
echo ===== Deployment completed with errors =====
105-
echo Exit code: %errorlevel%
106-
echo Check the log file for details.
113+
echo ===== Deployment finished with errors =====
114+
echo Exit code : %ps_exit%
115+
echo Log file : %~dp0DeployWorkstation.log
107116
)
108117

109118
goto :normal_exit
110119

111120
:error_exit
112121
echo.
113-
echo ===== Deployment failed =====
122+
echo ===== Launch aborted =====
114123
popd
115124
pause
116125
exit /b 1
117126

118127
:normal_exit
119-
REM 9) Return to original directory and pause
120128
popd
121129
echo.
122-
echo Press any key to exit...
130+
echo Press any key to close...
123131
pause >nul
124132
exit /b 0

0 commit comments

Comments
 (0)