From 200cd5bbdbd584d62999328b8039b4274e687724 Mon Sep 17 00:00:00 2001 From: Matt Date: Tue, 5 Apr 2022 23:38:12 +1000 Subject: [PATCH] Ignore modules_sup folder in bin\apache directory --- CHANGELOG.md | 14 +++++--------- ssl_config.bat | 14 ++++++++------ 2 files changed, 13 insertions(+), 15 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ebc8428..1b20ac6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,11 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a ## [Unreleased] +## [1.2.2] - 2022-04-05 + +### Fixed +- Ignore modules_sup folder in bin\apache directory (new to WampServer 3.2.8) + ## [1.2.1] - 2021-03-11 ### Added @@ -24,9 +29,6 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a ### Fixed - Added .gitattributes file to normalize EOL's for Windows OS when code is downloaded as ZIP file. -### Changed -- Updated version number. - ## [1.1.0] - 2020-06-22 ### Added @@ -38,17 +40,11 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a - Moved CLI argument count code (0 & >2) to a more logical section in ssl_config.bat - Fixed grammatical errors and general formatting in README.md -### Changed -- Updated version number. - ## [1.0.1] - 2020-06-15 ### Fixed - Added missing quotes around argument when calling isIniFile. -### Changed -- Updated version number. - ## [1.0.0] - 2020-06-14 ### Added diff --git a/ssl_config.bat b/ssl_config.bat index 6aae45b..ac1931e 100644 --- a/ssl_config.bat +++ b/ssl_config.bat @@ -7,7 +7,7 @@ rem INITIALISATION rem ----------------------- rem Set default variables rem ----------------------- -set $scriptVersion=1.2.1 +set $scriptVersion=1.2.2 set $scriptLogFileName=ssl_config.log rem WampServer sub-paths. @@ -266,11 +266,13 @@ for /f "delims=" %%a in ('dir %$config[wampServerInstallPath]%\%$subPathToApache rem Get version path rem ------------------ - set /A $totalApacheVersionsInstalled=$totalApacheVersionsInstalled+1 - rem Set the Apache version folder path to the array. - set $installedApacheVersionsArray[!$totalApacheVersionsInstalled!]=%%a - set $installedApacheVersionPathsArray[!$totalApacheVersionsInstalled!]=%$config[wampServerInstallPath]%\%$subPathToApacheFolders%\%%a - call :logToBoth " '%%a'" + if "%%a" neq "modules_sup" ( + set /A $totalApacheVersionsInstalled=$totalApacheVersionsInstalled+1 + rem Set the Apache version folder path to the array. + set $installedApacheVersionsArray[!$totalApacheVersionsInstalled!]=%%a + set $installedApacheVersionPathsArray[!$totalApacheVersionsInstalled!]=%$config[wampServerInstallPath]%\%$subPathToApacheFolders%\%%a + call :logToBoth " '%%a'" + ) )