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

Try using powershell to start the NSIS installer

Browse source
This commit is contained in:
twangboy 2023-10-17 09:24:10 -06:00 • committed by Pedro Algarvio
parent 1a0727a912
commit 7342246514
1 changed files with 24 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
tests/support/pkg.py
View file

@ -445,12 +445,18 @@ class SaltPkgInstall:
if pkg.endswith("exe"):
# Install the package
log.debug("Installing: %s", str(pkg))
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))
ps_cmd = (
f'$p = Start-Process -FilePath "{str(pkg)}" -ArgumentList '
f'"/start-minion=0","/S" -Wait -NoNewWindow -Passthru; '
f"exit $p.ExitCode"
)
ret = self.proc.run(
"powershell.exe",
"-ExecutionPolicy",
"Bypass",
"-Command",
f"'{ps_cmd}'",
)
self._check_retcode(ret)
elif pkg.endswith("msi"):
# Install the package
@ -813,12 +819,18 @@ class SaltPkgInstall:
ret = self.proc.run("cmd.exe", "/c", str(batch_file))
self._check_retcode(ret)
else:
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))
ps_cmd = (
f'$p = Start-Process -FilePath "{str(pkg_path)}" '
f'-ArgumentList "/start-minion=0","/S" -Wait -NoNewWindow '
f"-Passthru; exit $p.ExitCode"
)
ret = self.proc.run(
"powershell.exe",
"-ExecutionPolicy",
"Bypass",
"-Command",
f"'{ps_cmd}'",
)
self._check_retcode(ret)
log.debug("Removing installed salt-minion service")