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

Run the NSIS installer using start /wait

Browse source
This commit is contained in:
MKLeb 2023-09-19 15:30:48 -04:00
parent 0d1dcad59c
commit c218f71db9
No known key found for this signature in database
GPG key ID: 089B64EA1A99DDD1
1 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
pkg/tests/support/helpers.py
View file

@ -392,7 +392,13 @@ class SaltPkgInstall:
if pkg.endswith("exe"):
# Install the package
log.debug("Installing: %s", str(pkg))
ret = self.proc.run(str(pkg), "/start-minion=0", "/S")
# 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 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))
self._check_retcode(ret)
elif pkg.endswith("msi"):
# Install the package
@ -672,7 +678,13 @@ class SaltPkgInstall:
ret = self.proc.run("cmd.exe", "/c", str(batch_file))
self._check_retcode(ret)
else:
ret = self.proc.run(pkg_path, "/start-minion=0", "/S")
# 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 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))
self._check_retcode(ret)
log.debug("Removing installed salt-minion service")