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

Merge pull request #46624 from twangboy/win_fix_installer

Browse source 
Fix a few inconsitencies in the installer script
This commit is contained in:
Nicole Thomas 2018-03-20 13:47:43 -04:00 • committed by GitHub
commit 2fd3aa487c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -587,7 +587,7 @@ FunctionEnd
# Push "this is some string"
# Push "some"
# Call StrStr
# Pop $0 ; "some string"
# Pop $0 # "some string"
#------------------------------------------------------------------------------
!macro StrStr un
Function ${un}StrStr
@ -693,7 +693,7 @@ Function AddToPath
# Make sure the new length isn't over the NSIS_MAX_STRLEN
IntCmp $2 ${NSIS_MAX_STRLEN} +4 +4 0
DetailPrint "AddToPath: new length $2 > ${NSIS_MAX_STRLEN}"
DetailPrint "AddToPath Failed: new length $2 > ${NSIS_MAX_STRLEN}"
MessageBox MB_OK \
"You may add C:\salt to the %PATH% for convenience when issuing local salt commands from the command line." \
/SD IDOK