bug fix for URL redirect dependencies

Author: cvogt729

README.md

@@ -151,9 +151,11 @@ url:commons-compiler:https://repo1.maven.org/maven2/org/codehaus/janino/commons-
 file:spring-context:bin\lib
 file:javax.activation:bin\lib
 file:core-api:modules\core
+url:CommissioningScripts-0.1.1.jar:https://github.com/automatic-controls/commissioning-scripts/releases/download/v0.1.1-beta/CommissioningScripts-0.1.1.jar
+url:CommissioningScripts-0.1.1-sources.jar:https://github.com/automatic-controls/commissioning-scripts/releases/download/v0.1.1-beta/CommissioningScripts-0.1.1-sources.jar
 ```
 
-The general format is `scheme:identifier:location`. For files, the location is a relative path to the folder in your *WebCTRL* installation which contains the dependency. For urls, the location is a direct download link. The identifier should be the first part of the dependency's filename (excluding the version). Dependency filenames are generally expected to match the regular expression `^identifier-\d.*\.jar$`.
+The general format is `scheme:identifier:location`. For files, the location is a relative path to the folder in your *WebCTRL* installation which contains the dependency. For urls, the location is a direct download link. The identifier should be the first part of the dependency's filename (excluding the version). Dependency filenames are generally expected to match the regular expression `^identifier-\d.*\.jar$`. Alternatively, the identifier may be an exact match to the filename (including the *.jar* extension).
 
 ## Keystore Management
 

Utility.bat

@@ -46,7 +46,7 @@ if "%1" EQU "--goto" (
 setlocal EnableDelayedExpansion
 
 :: Version control
-set "version=1.1.0"
+set "version=1.1.1"
 if "%1" EQU "--version" (
   echo %version%
   exit /b
@@ -599,20 +599,22 @@ exit /b
 :: Parameters: <dependency-file> <output-folder>
 :collect
   setlocal
-    set "tmp1=%settings%\tmp1"
-    set "tmp2=%settings%\tmp2"
+    set "tmp1=%~dp0tmp1"
+    set "tmp2=%~dp0tmp2"
     set "err=0"
     set "msg=0"
     dir "%~f2\*.jar" /B /A-D 2>nul >"%tmp1%"
     for /F "usebackq tokens=1,2,* delims=:" %%i in ("%~f1") do (
+      set "findString=%%j"
+      if "!findString:~-4!" NEQ ".jar" set "findString=%%j-[0-9].*"
       set "exists=0"
-      for /F %%a in ('findstr /R /X "%%j-[0-9].*" "%tmp1%"') do (
+      for /F %%a in ('findstr /R /X "!findString!" "%tmp1%"') do (
         set "exists=1"
       )
       if "!exists!" EQU "0" (
         set "msg=1"
         if /I "%%i" EQU "url" (
-          curl --fail --silent --output-dir "%~f2" --remote-name %%k
+          curl --location --fail --silent --output-dir "%~f2" --remote-name %%k
           if !ErrorLevel! EQU 0 (
             echo Collected: %%j
           ) else (
@@ -622,7 +624,7 @@ exit /b
         ) else if /I "%%i" EQU "file" (
           set "file="
           dir "%WebCTRL%\%%k\*.jar" /B /A-D 2>nul >"%tmp2%"
-          for /F %%a in ('findstr /R /X "%%j-[0-9].*" "%tmp2%"') do (
+          for /F %%a in ('findstr /R /X "!findString!" "%tmp2%"') do (
             set "file=%%a"
           )
           if "!file!" EQU "" (