Version 1.2.0

Updates Readme
DavidGeeraerts · Jan 27, 2022 · 1e44325 · 1e44325
1 parent 6be0a75
commit 1e44325
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 16 deletions.
diff --git a/README.md b/README.md
@@ -2,12 +2,13 @@
 
 Wrapper module for [Dell Command Update](https://www.dell.com/support/kbdoc/en-us/000177325/dell-command-update).
 
-## Features
+## :ferris_wheel: Features
 
 - Intelligent wrapper for installing and running Dell Command Update
 - Program will install Dell Command Update if not present.
-- Checks if system is Dell
 - Checks local network file share repository for package.
+- If fetching from Dell website, parses for the latest version.
+- Checks if system is Dell
 - Uses `Wget` to download package.
 - Installs `Chocolatey` package manager if `Wget` not installed.
 - Uses `Winget` if `Chocolatey` isn't available
@@ -23,18 +24,18 @@ Though the program can be run manually on individual machines, it's standard pra
 - Add modules to a playbook
 - Use a deployment tool such as [PsExec/PsExec64](https://docs.microsoft.com/en-us/sysinternals/downloads/psexec) for large scale deployment and management. 
 
-## Configuration
+## :wrench: Configuration
 
-- Change `$DCU_PACKAGE` if it's a later package 
+- :gift: Change `$DCU_PACKAGE` to latest package 
 - If there's a local software repository, configure: `$LOCAL_REPO` e.g. `SET $LOCAL_REPO=\\Server\Share`
-- If there's a log server on the network, configure: `$LOG_SHIPPING_LOCATION` e.g. `SET "$LOG_SHIPPING_LOCATION=\\Server\Share"`
+- :satellite: If there's a log server on the network, configure: `$LOG_SHIPPING_LOCATION` e.g. `SET "$LOG_SHIPPING_LOCATION=\\Server\Share"`
 
 
-::	**Latest URI**
+::	:new: **Latest URI**
 
 `SET "$DCU_PACKAGE=Dell-Command-Update-Windows-Universal-Application_PWD0M_WIN_4.4.0_A00.EXE"`
 
-`SET "$URI_PACKAGE=https://dl.dell.com/FOLDER07870027M/1/%$DCU_PACKAGE%"`
+:link: `SET "$URI_PACKAGE=https://dl.dell.com/FOLDER07870027M/1/%$DCU_PACKAGE%"`
 
 :: **Local Network Repository**
 
@@ -63,12 +64,18 @@ Though the program can be run manually on individual machines, it's standard pra
 `SET "$LOG_SHIPPING_LOCATION="`
 
 
-### ToDo
+### :calendar: ToDo
 
+- ChangeLog
 - Provide configuration for scheduled task
 
 
-### Change Log
+### :notebook: Change Log
+
+#### :new: Version 1.2.0
+
+
+
 
 #### Version 1.1.0
 
@@ -77,7 +84,6 @@ Though the program can be run manually on individual machines, it's standard pra
 - Fixed winget
 
 
-
 #### Version 1.0.0
 
 - First release
diff --git a/module_utility_Dell_Command_Update.cmd b/module_utility_Dell_Command_Update.cmd
@@ -12,8 +12,6 @@
 
 :: Dell Command Update
 ::	https://www.dell.com/support/kbdoc/en-us/000177325/dell-command-update
-::	Latest URI
-::	https://dl.dell.com/FOLDER07870027M/1/Dell-Command-Update-Windows-Universal-Application_PWD0M_WIN_4.4.0_A00.EXE
 :::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
 
 ::::::::::::::::::::::::::::::::::
@@ -27,8 +25,8 @@
 SETLOCAL Enableextensions
 :::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
 SET $SCRIPT_NAME=module_utility_Dell_Command_Update
-SET $SCRIPT_VERSION=1.1.0
-SET $SCRIPT_BUILD=20220126
+SET $SCRIPT_VERSION=1.2.0
+SET $SCRIPT_BUILD=20220127
 Title %$SCRIPT_NAME% Version: %$SCRIPT_VERSION%
 mode con:cols=100
 mode con:lines=44
@@ -41,7 +39,7 @@ color 03
 :: Declare Global variables
 ::###########################################################################::
 
-::	Latest URI
+::	Last known package URI
 SET "$DCU_PACKAGE=Dell-Command-Update-Windows-Universal-Application_PWD0M_WIN_4.4.0_A00.EXE"
 SET "$URI_PACKAGE=https://dl.dell.com/FOLDER07870027M/1/%$DCU_PACKAGE%"
 
@@ -220,9 +218,22 @@ SET $CLEANUP=0
 
 	CD /D %PUBLIC%\Downloads
 	wget --version 1> nul 2> nul && (
+		CD /D "%$LOG_D%\cache"
+		if exist dell-command-update.html del /F /Q dell-command-update.html
+		wget "https://www.dell.com/support/kbdoc/en-us/000177325/dell-command-update.html"
+		for /f "tokens=6 delims=^< " %%P IN ('findstr /C:"h3><strong>Dell Command | Update" "%$LOG_D%\cache\dell-command-update.html"') DO ECHO %%P>> "%$LOG_D%\cache\DCU-Versions.txt"
+		SET /P $DCU_LATEST= < "%$LOG_D%\cache\DCU-Versions.txt"
+		echo %$ISO_DATE% %TIME% [DEBUG]	$DCU_LATEST: {%$DCU_LATEST%} >> "%$LOG_D%\%$LOG_FILE%"
+		echo %$DCU_LATEST% | FINDSTR /R /C:"[0-9].[0-9].[0-9]" 2>nul || SET "$DCU_LATEST=%$DCU_LATEST%.0"
+		echo %$ISO_DATE% %TIME% [DEBUG]	$DCU_LATEST: {%$DCU_LATEST%} >> "%$LOG_D%\%$LOG_FILE%"
+		CD /D %PUBLIC%\Downloads
+		SET $DCU_PACKAGE=Dell-Command-Update-Windows-Universal-Application_PWD0M_WIN_%$DCU_LATEST%_A00.EXE
+		echo %$ISO_DATE% %TIME% [DEBUG]	$DCU_PACKAGE: {%$DCU_PACKAGE%} >> "%$LOG_D%\%$LOG_FILE%"
+		SET "$URI_PACKAGE=https://dl.dell.com/FOLDER07870027M/1/%$DCU_PACKAGE%"
+		echo %$ISO_DATE% %TIME% [DEBUG]	$URI_PACKAGE: {%$URI_PACKAGE%} >> "%$LOG_D%\%$LOG_FILE%"
 		wget "%$URI_PACKAGE%"
 		echo %$ISO_DATE% %TIME% [INFO]	Dell Command Updated downloaded from Dell website. >> "%$LOG_D%\%$LOG_FILE%"
-		echo %$ISO_DATE% %TIME% [INFO]	Package: %$DCU_PACKAGE% >> "%$LOG_D%\%$LOG_FILE%"
+		echo %$ISO_DATE% %TIME% [INFO]	Package: %$DCU_PACKAGE% >> "%$LOG_D%\%$LOG_FILE%" "%$LOG_D%\cache
 		GoTo skip_DCU-Get
 		)
 	:: When wget isn't installed to get the latest DCU package
@@ -255,6 +266,7 @@ SET $CLEANUP=0
 	GoTo Close
 	)
 	dcu-cli.exe /version >> "%$LOG_D%\%$LOG_FILE%"
+	dcu-cli.exe /version
 	echo.
 
 :DCU-Scan