Skip to content

[3006.x] Use jscript instead of vscript #67984

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dwoz merged 2 commits into from
Apr 27, 2025
Merged

[3006.x] Use jscript instead of vscript #67984

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
014a771
Use jscript instead of vscript
twangboy Apr 24, 2025
a4f9e03
Add changelog
twangboy Apr 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions changelog/67982.fixed.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Use a Jscript Custom Action to stop the salt-minion service on Windows instead
of a VBscript Custom Action due to future deprecation and security issues
11 changes: 7 additions & 4 deletions pkg/windows/msi/Product.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,10 +148,13 @@ IMCAC - Immediate Custom Action - It's immediate
Another application has exclusive access to the file \salt\var\log\salt\minion
Please shut down the application
-->
<CustomAction Id="stopSalt" Script="vbscript">
On error resume next
Set objShell = CreateObject("WScript.Shell")
objShell.Run "net stop salt-minion", 0, true
<CustomAction Id="stopSalt" Script="jscript">
try {
var objShell = new ActiveXObject("WScript.Shell");
objShell.Run("net stop salt-minion", 0, true);
} catch (e) {
// Handle error if needed
}
</CustomAction>

<!-- This is the import statement for the Custom Actions:
Expand Down
Loading