saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Quote the start command

Browse source
This commit is contained in:
twangboy 2023-09-20 12:23:04 -06:00 • committed by Pedro Algarvio
parent 12a8655c5f
commit 1a0727a912
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
tests/support/pkg.py
View file

@ -445,10 +445,9 @@ class SaltPkgInstall:
if pkg.endswith("exe"):
# Install the package
log.debug("Installing: %s", str(pkg))
# ret = self.proc.run("start", "/wait", f"\"{str(pkg)} /start-minion=0 /S\"")
batch_file = pathlib.Path(pkg).parent / "install_nsis.cmd"
batch_content = f"start /wait {str(pkg)} /start-minion=0 /S"
with salt.utils.files.fopen(batch_file, "w") as fp:
batch_content = f'start "" /wait "{str(pkg)}" /start-minion=0 /S'
with open(batch_file, "w") as fp:
fp.write(batch_content)
# Now run the batch file
ret = self.proc.run("cmd.exe", "/c", str(batch_file))
@ -814,10 +813,9 @@ class SaltPkgInstall:
ret = self.proc.run("cmd.exe", "/c", str(batch_file))
self._check_retcode(ret)
else:
# ret = self.proc.run("start", "/wait", f"\"{pkg_path} /start-minion=0 /S\"")
batch_file = pkg_path.parent / "install_nsis.cmd"
batch_content = f"start /wait {str(pkg_path)} /start-minion=0 /S"
with salt.utils.files.fopen(batch_file, "w") as fp:
batch_content = f'start "" /wait "{str(pkg_path)}" /start-minion=0 /S'
with open(batch_file, "w") as fp:
fp.write(batch_content)
# Now run the batch file
ret = self.proc.run("cmd.exe", "/c", str(batch_file))