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

Ignore any PYTHON* environment vars already on the system

Browse source
This commit is contained in:
twangboy 2017-07-26 13:42:12 -06:00
parent 4e2fb03a95
commit 9af1eb2741
9 changed files with 9 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -8,9 +8,5 @@ Set SaltDir=%SaltDir:~0,-1%
Set Python=%SaltDir%\bin\python.exe
Set Script=%SaltDir%\bin\Scripts\salt-call
:: Set PYTHONPATH
Set PYTHONPATH=C:\salt\bin;C:\salt\bin\Lib\site-packages
:: Launch Script
"%Python%" "%Script%" %*
"%Python%" -E "%Script%" %*

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

@ -8,9 +8,5 @@ Set SaltDir=%SaltDir:~0,-1%
Set Python=%SaltDir%\bin\python.exe
Set Script=%SaltDir%\bin\Scripts\salt-cp
:: Set PYTHONPATH
Set PYTHONPATH=C:\salt\bin;C:\salt\bin\Lib\site-packages
:: Launch Script
"%Python%" "%Script%" %*
"%Python%" -E "%Script%" %*

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

@ -8,9 +8,5 @@ Set SaltDir=%SaltDir:~0,-1%
Set Python=%SaltDir%\bin\python.exe
Set Script=%SaltDir%\bin\Scripts\salt-key
:: Set PYTHONPATH
Set PYTHONPATH=C:\salt\bin;C:\salt\bin\Lib\site-packages
:: Launch Script
"%Python%" "%Script%" %*
"%Python%" -E "%Script%" %*

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

@ -8,9 +8,5 @@ Set SaltDir=%SaltDir:~0,-1%
Set Python=%SaltDir%\bin\python.exe
Set Script=%SaltDir%\bin\Scripts\salt-master
:: Set PYTHONPATH
Set PYTHONPATH=C:\salt\bin;C:\salt\bin\Lib\site-packages
:: Launch Script
"%Python%" "%Script%" %*
"%Python%" -E "%Script%" %*

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

@ -8,12 +8,8 @@ Set SaltDir=%SaltDir:~0,-1%
Set Python=%SaltDir%\bin\python.exe
Set Script=%SaltDir%\bin\Scripts\salt-minion
:: Set PYTHONPATH
Set PYTHONPATH=C:\salt\bin;C:\salt\bin\Lib\site-packages
:: Stop the Salt Minion service
net stop salt-minion
:: Launch Script
"%Python%" "%Script%" -l debug
"%Python%" -E "%Script%" -l debug

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

@ -8,9 +8,5 @@ Set SaltDir=%SaltDir:~0,-1%
Set Python=%SaltDir%\bin\python.exe
Set Script=%SaltDir%\bin\Scripts\salt-minion
:: Set PYTHONPATH
Set PYTHONPATH=C:\salt\bin;C:\salt\bin\Lib\site-packages
:: Launch Script
"%Python%" "%Script%" %*
"%Python%" -E "%Script%" %*

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

@ -8,9 +8,5 @@ Set SaltDir=%SaltDir:~0,-1%
Set Python=%SaltDir%\bin\python.exe
Set Script=%SaltDir%\bin\Scripts\salt-run
:: Set PYTHONPATH
Set PYTHONPATH=C:\salt\bin;C:\salt\bin\Lib\site-packages
:: Launch Script
"%Python%" "%Script%" %*
"%Python%" -E "%Script%" %*

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

@ -8,9 +8,5 @@ Set SaltDir=%SaltDir:~0,-1%
Set Python=%SaltDir%\bin\python.exe
Set Script=%SaltDir%\bin\Scripts\salt
:: Set PYTHONPATH
Set PYTHONPATH=C:\salt\bin;C:\salt\bin\Lib\site-packages
:: Launch Script
"%Python%" "%Script%" %*
"%Python%" -E "%Script%" %*

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

@ -334,8 +334,7 @@ Section -Post
WriteRegStr HKLM "${PRODUCT_MINION_REGKEY}" "Path" "$INSTDIR\bin\"
; Register the Salt-Minion Service
nsExec::Exec "nssm.exe install salt-minion $INSTDIR\bin\python.exe $INSTDIR\bin\Scripts\salt-minion -c $INSTDIR\conf -l quiet"
nsExec::Exec "nssm.exe set salt-minion AppEnvironmentExtra PYTHONHOME= PYTHONPATH=C:\salt\bin;C:\salt\bin\Lib\site-packages"
nsExec::Exec "nssm.exe install salt-minion $INSTDIR\bin\python.exe -E $INSTDIR\bin\Scripts\salt-minion -c $INSTDIR\conf -l quiet"
nsExec::Exec "nssm.exe set salt-minion Description Salt Minion from saltstack.com"
nsExec::Exec "nssm.exe set salt-minion AppNoConsole 1"