Add back ssm.exe. It is needed for VMtools

saltstack · Mar 1, 2023 · b964220 · b964220
1 parent c60d2aa
commit b964220
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 11 deletions.
diff --git a/pkg/windows/prep_salt.ps1 b/pkg/windows/prep_salt.ps1
@@ -141,16 +141,14 @@ if ( Test-Path -Path $PREREQ_DIR ) {
 # Staging the Build Environment
 #-------------------------------------------------------------------------------
 
-if ( $PKG ) {
-    Write-Host "Copying config files from Salt: " -NoNewline
-    New-Item -Path $BUILD_CONF_DIR -ItemType Directory | Out-Null
-    Copy-Item -Path "$PROJECT_DIR\conf\minion" -Destination "$BUILD_CONF_DIR"
-    if ( Test-Path -Path "$BUILD_CONF_DIR\minion" ) {
-        Write-Result "Success" -ForegroundColor Green
-    } else {
-        Write-Result "Failed" -ForegroundColor Red
-        exit 1
-    }
+Write-Host "Copying config files from Salt: " -NoNewline
+New-Item -Path $BUILD_CONF_DIR -ItemType Directory | Out-Null
+Copy-Item -Path "$PROJECT_DIR\conf\minion" -Destination "$BUILD_CONF_DIR"
+if ( Test-Path -Path "$BUILD_CONF_DIR\minion" ) {
+    Write-Result "Success" -ForegroundColor Green
+} else {
+    Write-Result "Failed" -ForegroundColor Red
+    exit 1
 }
 
 if ( $PKG ) {

diff --git a/tools/pkg.py b/tools/pkg.py
@@ -223,7 +223,7 @@ def set_salt_version(
 )
 def pre_archive_cleanup(ctx: Context, cleanup_path: str, pkg: bool = False):
     """
-    Clean the provided path of paths that shouyld not be included in the archive.
+    Clean the provided path of paths that should not be included in the archive.
 
     For example: