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 2

Fix batch scripts and service start

Browse source
This commit is contained in:
Twangboy 2022-10-19 17:34:45 -06:00
parent 8a9b9b9dc1
commit adb6ca3045
No known key found for this signature in database
GPG key ID: ED267D5C0DE6F8A6
10 changed files with 28 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
pkg/windows/buildenv/salt-api.bat
View file

@ -5,8 +5,7 @@
:: Define Variables
Set SaltDir=%~dp0
Set SaltDir=%SaltDir:~0,-1%
Set Python=%SaltDir%\bin\Scripts\python.exe
Set Script=%SaltDir%\bin\Scripts\salt-api
Set Binary=%SaltDir%\bin\Scripts\salt-api.exe
:: Launch Script
"%Python%" -E -s "%Script%" %*
:: Launch binary
"%Binary%" %*

7
pkg/windows/buildenv/salt-call.bat
View file

@ -5,8 +5,7 @@
:: Define Variables
Set SaltDir=%~dp0
Set SaltDir=%SaltDir:~0,-1%
Set Python=%SaltDir%\bin\Scripts\python.exe
Set Script=%SaltDir%\bin\Scripts\salt-call
Set Binary=%SaltDir%\bin\Scripts\salt-call.exe
:: Launch Script
"%Python%" -E -s "%Script%" %*
:: Launch binary
"%Binary%" %*

7
pkg/windows/buildenv/salt-cp.bat
View file

@ -5,8 +5,7 @@
:: Define Variables
Set SaltDir=%~dp0
Set SaltDir=%SaltDir:~0,-1%
Set Python=%SaltDir%\bin\Scripts\python.exe
Set Script=%SaltDir%\bin\Scripts\salt-cp
Set Binary=%SaltDir%\bin\Scripts\salt-cp.exe
:: Launch Script
"%Python%" -E -s "%Script%" %*
:: Launch binary
"%Binary%" %*

7
pkg/windows/buildenv/salt-key.bat
View file

@ -5,8 +5,7 @@
:: Define Variables
Set SaltDir=%~dp0
Set SaltDir=%SaltDir:~0,-1%
Set Python=%SaltDir%\bin\Scripts\python.exe
Set Script=%SaltDir%\bin\Scripts\salt-key
Set Binary=%SaltDir%\bin\Scripts\salt-key.exe
:: Launch Script
"%Python%" -E -s "%Script%" %*
:: Launch binary
"%Binary%" %*

7
pkg/windows/buildenv/salt-master.bat
View file

@ -5,8 +5,7 @@
:: Define Variables
Set SaltDir=%~dp0
Set SaltDir=%SaltDir:~0,-1%
Set Python=%SaltDir%\bin\Scripts\python.exe
Set Script=%SaltDir%\bin\Scripts\salt-master
Set Binary=%SaltDir%\bin\Scripts\salt-master.exe
:: Launch Script
"%Python%" -E -s "%Script%" %*
:: Launch binary
"%Binary%" %*

7
pkg/windows/buildenv/salt-minion-debug.bat
View file

@ -5,11 +5,10 @@
:: Define Variables
Set SaltDir=%~dp0
Set SaltDir=%SaltDir:~0,-1%
Set Python=%SaltDir%\bin\Scripts\python.exe
Set Script=%SaltDir%\bin\Scripts\salt-minion
Set Binary=%SaltDir%\bin\Scripts\salt-minion.exe
:: Stop the Salt Minion service
net stop salt-minion
:: Launch Script
"%Python%" -E -s "%Script%" -l debug
:: Launch binary
"%Binary%" -l debug

7
pkg/windows/buildenv/salt-minion.bat
View file

@ -5,8 +5,7 @@
:: Define Variables
Set SaltDir=%~dp0
Set SaltDir=%SaltDir:~0,-1%
Set Python=%SaltDir%\bin\Scripts\python.exe
Set Script=%SaltDir%\bin\Scripts\salt-minion
Set Binary=%SaltDir%\bin\Scripts\salt-minion.exe
:: Launch Script
"%Python%" -E -s "%Script%" %*
:: Launch binary
"%Binary%" %*

7
pkg/windows/buildenv/salt-run.bat
View file

@ -5,8 +5,7 @@
:: Define Variables
Set SaltDir=%~dp0
Set SaltDir=%SaltDir:~0,-1%
Set Python=%SaltDir%\bin\Scripts\python.exe
Set Script=%SaltDir%\bin\Scripts\salt-run
Set Binary=%SaltDir%\bin\Scripts\salt-run.exe
:: Launch Script
"%Python%" -E -s "%Script%" %*
:: Launch binary
"%Binary%" %*

7
pkg/windows/buildenv/salt.bat
View file

@ -5,8 +5,7 @@
:: Define Variables
Set SaltDir=%~dp0
Set SaltDir=%SaltDir:~0,-1%
Set Python=%SaltDir%\bin\Scripts\python.exe
Set Script=%SaltDir%\bin\Scripts\salt
Set Binary=%SaltDir%\bin\Scripts\salt.exe
:: Launch Script
"%Python%" -E -s "%Script%" %*
:: Launch binary
"%Binary%" %*

2
pkg/windows/installer/Salt-Minion-Setup.nsi
View file

@ -970,7 +970,7 @@ Section -Post
SetRegView 32 # Set it back to the 32 bit portion of the registry
# Register the Salt-Minion Service
nsExec::Exec `$INSTDIR\bin\Scripts\ssm.exe install salt-minion "$INSTDIR\bin\Scripts\python.exe" -E -s """$INSTDIR\bin\Scripts\salt-minion""" -c """$RootDir\conf""" -l quiet`
nsExec::Exec `$INSTDIR\bin\Scripts\ssm.exe install salt-minion "$INSTDIR\bin\Scripts\salt-minion.exe" -c """$RootDir\conf""" -l quiet`
nsExec::Exec "$INSTDIR\bin\Scripts\ssm.exe set salt-minion Description Salt Minion from saltstack.com"
nsExec::Exec "$INSTDIR\bin\Scripts\ssm.exe set salt-minion Start SERVICE_AUTO_START"
nsExec::Exec "$INSTDIR\bin\Scripts\ssm.exe set salt-minion AppStopMethodConsole 24000"