valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-06 16:45:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #43461 from twangboy/win_norestart

Browse Source 
Add `/norestart` switch to vcredist install
This commit is contained in:
Mike Place 2017-09-12 14:33:45 -06:00 committed by GitHub
commit f2b86fa2db
1 changed files with 214 additions and 192 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

406
pkg/windows/installer/Salt-Minion-Setup.nsi
View File

@ -38,7 +38,7 @@ ${StrStrAdv}
!define CPUARCH "x86" !define CPUARCH "x86"
!endif !endif
; Part of the Trim function for Strings # Part of the Trim function for Strings
!define Trim "!insertmacro Trim" !define Trim "!insertmacro Trim"
!macro Trim ResultVar String !macro Trim ResultVar String
Push "${String}" Push "${String}"
@ -55,27 +55,27 @@ ${StrStrAdv}
!define MUI_UNICON "salt.ico" !define MUI_UNICON "salt.ico"
!define MUI_WELCOMEFINISHPAGE_BITMAP "panel.bmp" !define MUI_WELCOMEFINISHPAGE_BITMAP "panel.bmp"
; Welcome page # Welcome page
!insertmacro MUI_PAGE_WELCOME !insertmacro MUI_PAGE_WELCOME
; License page # License page
!insertmacro MUI_PAGE_LICENSE "LICENSE.txt" !insertmacro MUI_PAGE_LICENSE "LICENSE.txt"
; Configure Minion page # Configure Minion page
Page custom pageMinionConfig pageMinionConfig_Leave Page custom pageMinionConfig pageMinionConfig_Leave
; Instfiles page # Instfiles page
!insertmacro MUI_PAGE_INSTFILES !insertmacro MUI_PAGE_INSTFILES
; Finish page (Customized) # Finish page (Customized)
!define MUI_PAGE_CUSTOMFUNCTION_SHOW pageFinish_Show !define MUI_PAGE_CUSTOMFUNCTION_SHOW pageFinish_Show
!define MUI_PAGE_CUSTOMFUNCTION_LEAVE pageFinish_Leave !define MUI_PAGE_CUSTOMFUNCTION_LEAVE pageFinish_Leave
!insertmacro MUI_PAGE_FINISH !insertmacro MUI_PAGE_FINISH
; Uninstaller pages # Uninstaller pages
!insertmacro MUI_UNPAGE_INSTFILES !insertmacro MUI_UNPAGE_INSTFILES
; Language files # Language files
!insertmacro MUI_LANGUAGE "English" !insertmacro MUI_LANGUAGE "English"
@ -175,11 +175,11 @@ ShowInstDetails show
ShowUnInstDetails show ShowUnInstDetails show
; Check and install Visual C++ 2008 SP1 MFC Security Update redist packages # Check and install Visual C++ 2008 SP1 MFC Security Update redist packages
; See http://blogs.msdn.com/b/astebner/archive/2009/01/29/9384143.aspx for more info # See http://blogs.msdn.com/b/astebner/archive/2009/01/29/9384143.aspx for more info
Section -Prerequisites Section -Prerequisites
; VCRedist only needed on Windows Server 2008R2/Windows 7 and below # VCRedist only needed on Windows Server 2008R2/Windows 7 and below
${If} ${AtMostWin2008R2} ${If} ${AtMostWin2008R2}
!define VC_REDIST_X64_GUID "{5FCE6D76-F5DC-37AB-B2B8-22AB8CEDB1D4}" !define VC_REDIST_X64_GUID "{5FCE6D76-F5DC-37AB-B2B8-22AB8CEDB1D4}"
@ -200,17 +200,38 @@ Section -Prerequisites
"VC Redist 2008 SP1 MFC is currently not installed. Would you like to install?" \ "VC Redist 2008 SP1 MFC is currently not installed. Would you like to install?" \
/SD IDYES IDNO endVcRedist /SD IDYES IDNO endVcRedist
ClearErrors # The Correct version of VCRedist is copied over by "build_pkg.bat"
; The Correct version of VCRedist is copied over by "build_pkg.bat"
SetOutPath "$INSTDIR\" SetOutPath "$INSTDIR\"
File "..\prereqs\vcredist.exe" File "..\prereqs\vcredist.exe"
ExecWait "$INSTDIR\vcredist.exe /qb!" # If an output variable is specified ($0 in the case below),
IfErrors 0 endVcRedist # ExecWait sets the variable with the exit code (and only sets the
# error flag if an error occurs; if an error occurs, the contents
# of the user variable are undefined).
# http://nsis.sourceforge.net/Reference/ExecWait
ClearErrors
ExecWait '"$INSTDIR\vcredist.exe" /qb! /norestart' $0
IfErrors 0 CheckVcRedistErrorCode
MessageBox MB_OK \ MessageBox MB_OK \
"VC Redist 2008 SP1 MFC failed to install. Try installing the package manually." \ "VC Redist 2008 SP1 MFC failed to install. Try installing the package manually." \
/SD IDOK /SD IDOK
Goto endVcRedist
checkVcRedistErrorCode:
# Check for Reboot Error Code (3010)
${If} $0 == 3010
MessageBox MB_OK \
"VC Redist 2008 SP1 MFC installed but requires a restart to complete." \
/SD IDOK
# Check for any other errors
${ElseIfNot} $0 == 0
MessageBox MB_OK \
"VC Redist 2008 SP1 MFC failed with ErrorCode: $0. Try installing the package manually." \
/SD IDOK
${EndIf}
endVcRedist: endVcRedist:
${EndIf} ${EndIf}
${EndIf} ${EndIf}
@ -236,12 +257,12 @@ Function .onInit
Call parseCommandLineSwitches Call parseCommandLineSwitches
; Check for existing installation # Check for existing installation
ReadRegStr $R0 HKLM \ ReadRegStr $R0 HKLM \
"Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" \ "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" \
"UninstallString" "UninstallString"
StrCmp $R0 "" checkOther StrCmp $R0 "" checkOther
; Found existing installation, prompt to uninstall # Found existing installation, prompt to uninstall
MessageBox MB_OKCANCEL|MB_ICONEXCLAMATION \ MessageBox MB_OKCANCEL|MB_ICONEXCLAMATION \
"${PRODUCT_NAME} is already installed.$\n$\n\ "${PRODUCT_NAME} is already installed.$\n$\n\
Click `OK` to remove the existing installation." \ Click `OK` to remove the existing installation." \
@ -249,12 +270,12 @@ Function .onInit
Abort Abort
checkOther: checkOther:
; Check for existing installation of full salt # Check for existing installation of full salt
ReadRegStr $R0 HKLM \ ReadRegStr $R0 HKLM \
"Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME_OTHER}" \ "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME_OTHER}" \
"UninstallString" "UninstallString"
StrCmp $R0 "" skipUninstall StrCmp $R0 "" skipUninstall
; Found existing installation, prompt to uninstall # Found existing installation, prompt to uninstall
MessageBox MB_OKCANCEL|MB_ICONEXCLAMATION \ MessageBox MB_OKCANCEL|MB_ICONEXCLAMATION \
"${PRODUCT_NAME_OTHER} is already installed.$\n$\n\ "${PRODUCT_NAME_OTHER} is already installed.$\n$\n\
Click `OK` to remove the existing installation." \ Click `OK` to remove the existing installation." \
@ -262,27 +283,27 @@ Function .onInit
Abort Abort
uninst: uninst:
; Make sure we're in the right directory # Make sure we're in the right directory
${If} $INSTDIR == "c:\salt\bin\Scripts" ${If} $INSTDIR == "c:\salt\bin\Scripts"
StrCpy $INSTDIR "C:\salt" StrCpy $INSTDIR "C:\salt"
${EndIf} ${EndIf}
; Stop and remove the salt-minion service # Stop and remove the salt-minion service
nsExec::Exec 'net stop salt-minion' nsExec::Exec 'net stop salt-minion'
nsExec::Exec 'sc delete salt-minion' nsExec::Exec 'sc delete salt-minion'
; Stop and remove the salt-master service # Stop and remove the salt-master service
nsExec::Exec 'net stop salt-master' nsExec::Exec 'net stop salt-master'
nsExec::Exec 'sc delete salt-master' nsExec::Exec 'sc delete salt-master'
; Remove salt binaries and batch files # Remove salt binaries and batch files
Delete "$INSTDIR\uninst.exe" Delete "$INSTDIR\uninst.exe"
Delete "$INSTDIR\nssm.exe" Delete "$INSTDIR\nssm.exe"
Delete "$INSTDIR\salt*" Delete "$INSTDIR\salt*"
Delete "$INSTDIR\vcredist.exe" Delete "$INSTDIR\vcredist.exe"
RMDir /r "$INSTDIR\bin" RMDir /r "$INSTDIR\bin"
; Remove registry entries # Remove registry entries
DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}"
DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY_OTHER}" DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY_OTHER}"
DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_CALL_REGKEY}" DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_CALL_REGKEY}"
@ -292,7 +313,7 @@ Function .onInit
DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_MINION_REGKEY}" DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_MINION_REGKEY}"
DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_RUN_REGKEY}" DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_RUN_REGKEY}"
; Remove C:\salt from the Path # Remove C:\salt from the Path
Push "C:\salt" Push "C:\salt"
Call RemoveFromPath Call RemoveFromPath
@ -305,7 +326,7 @@ Section -Post
WriteUninstaller "$INSTDIR\uninst.exe" WriteUninstaller "$INSTDIR\uninst.exe"
; Uninstall Registry Entries # Uninstall Registry Entries
WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" \ WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" \
"DisplayName" "$(^Name)" "DisplayName" "$(^Name)"
WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" \ WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" \
@ -321,24 +342,24 @@ Section -Post
WriteRegStr HKLM "SYSTEM\CurrentControlSet\services\salt-minion" \ WriteRegStr HKLM "SYSTEM\CurrentControlSet\services\salt-minion" \
"DependOnService" "nsi" "DependOnService" "nsi"
; Set the estimated size # Set the estimated size
${GetSize} "$INSTDIR\bin" "/S=OK" $0 $1 $2 ${GetSize} "$INSTDIR\bin" "/S=OK" $0 $1 $2
IntFmt $0 "0x%08X" $0 IntFmt $0 "0x%08X" $0
WriteRegDWORD ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" \ WriteRegDWORD ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" \
"EstimatedSize" "$0" "EstimatedSize" "$0"
; Commandline Registry Entries # Commandline Registry Entries
WriteRegStr HKLM "${PRODUCT_CALL_REGKEY}" "" "$INSTDIR\salt-call.bat" WriteRegStr HKLM "${PRODUCT_CALL_REGKEY}" "" "$INSTDIR\salt-call.bat"
WriteRegStr HKLM "${PRODUCT_CALL_REGKEY}" "Path" "$INSTDIR\bin\" WriteRegStr HKLM "${PRODUCT_CALL_REGKEY}" "Path" "$INSTDIR\bin\"
WriteRegStr HKLM "${PRODUCT_MINION_REGKEY}" "" "$INSTDIR\salt-minion.bat" WriteRegStr HKLM "${PRODUCT_MINION_REGKEY}" "" "$INSTDIR\salt-minion.bat"
WriteRegStr HKLM "${PRODUCT_MINION_REGKEY}" "Path" "$INSTDIR\bin\" WriteRegStr HKLM "${PRODUCT_MINION_REGKEY}" "Path" "$INSTDIR\bin\"
; Register the Salt-Minion Service # Register the Salt-Minion Service
nsExec::Exec "nssm.exe install salt-minion $INSTDIR\bin\python.exe -E -s $INSTDIR\bin\Scripts\salt-minion -c $INSTDIR\conf -l quiet" nsExec::Exec "nssm.exe install salt-minion $INSTDIR\bin\python.exe -E -s $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 Description Salt Minion from saltstack.com"
nsExec::Exec "nssm.exe set salt-minion AppNoConsole 1" nsExec::Exec "nssm.exe set salt-minion AppNoConsole 1"
RMDir /R "$INSTDIR\var\cache\salt" ; removing cache from old version RMDir /R "$INSTDIR\var\cache\salt" # removing cache from old version
Call updateMinionConfig Call updateMinionConfig
@ -352,7 +373,7 @@ SectionEnd
Function .onInstSuccess Function .onInstSuccess
; If start-minion is 1, then start the service # If start-minion is 1, then start the service
${If} $StartMinion == 1 ${If} $StartMinion == 1
nsExec::Exec 'net start salt-minion' nsExec::Exec 'net start salt-minion'
${EndIf} ${EndIf}
@ -370,35 +391,35 @@ FunctionEnd
Section Uninstall Section Uninstall
; Stop and Remove salt-minion service # Stop and Remove salt-minion service
nsExec::Exec 'net stop salt-minion' nsExec::Exec 'net stop salt-minion'
nsExec::Exec 'sc delete salt-minion' nsExec::Exec 'sc delete salt-minion'
; Remove files # Remove files
Delete "$INSTDIR\uninst.exe" Delete "$INSTDIR\uninst.exe"
Delete "$INSTDIR\nssm.exe" Delete "$INSTDIR\nssm.exe"
Delete "$INSTDIR\salt*" Delete "$INSTDIR\salt*"
Delete "$INSTDIR\vcredist.exe" Delete "$INSTDIR\vcredist.exe"
; Remove salt directory, you must check to make sure you're not removing # Remove salt directory, you must check to make sure you're not removing
; the Program Files directory # the Program Files directory
${If} $INSTDIR != 'Program Files' ${If} $INSTDIR != 'Program Files'
${AndIf} $INSTDIR != 'Program Files (x86)' ${AndIf} $INSTDIR != 'Program Files (x86)'
RMDir /r "$INSTDIR" RMDir /r "$INSTDIR"
${EndIf} ${EndIf}
; Remove Uninstall Entries # Remove Uninstall Entries
DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}"
; Remove Commandline Entries # Remove Commandline Entries
DeleteRegKey HKLM "${PRODUCT_CALL_REGKEY}" DeleteRegKey HKLM "${PRODUCT_CALL_REGKEY}"
DeleteRegKey HKLM "${PRODUCT_MINION_REGKEY}" DeleteRegKey HKLM "${PRODUCT_MINION_REGKEY}"
; Remove C:\salt from the Path # Remove C:\salt from the Path
Push "C:\salt" Push "C:\salt"
Call un.RemoveFromPath Call un.RemoveFromPath
; Automatically close when finished # Automatically close when finished
SetAutoClose true SetAutoClose true
SectionEnd SectionEnd
@ -429,7 +450,7 @@ FunctionEnd
Function Trim Function Trim
Exch $R1 ; Original string Exch $R1 # Original string
Push $R2 Push $R2
Loop: Loop:
@ -461,36 +482,36 @@ Function Trim
FunctionEnd FunctionEnd
;------------------------------------------------------------------------------ #------------------------------------------------------------------------------
; StrStr Function # StrStr Function
; - find substring in a string # - find substring in a string
; #
; Usage: # Usage:
; Push "this is some string" # Push "this is some string"
; Push "some" # Push "some"
; Call StrStr # Call StrStr
; Pop $0 ; "some string" # Pop $0 ; "some string"
;------------------------------------------------------------------------------ #------------------------------------------------------------------------------
!macro StrStr un !macro StrStr un
Function ${un}StrStr Function ${un}StrStr
Exch $R1 ; $R1=substring, stack=[old$R1,string,...] Exch $R1 # $R1=substring, stack=[old$R1,string,...]
Exch ; stack=[string,old$R1,...] Exch # stack=[string,old$R1,...]
Exch $R2 ; $R2=string, stack=[old$R2,old$R1,...] Exch $R2 # $R2=string, stack=[old$R2,old$R1,...]
Push $R3 ; $R3=strlen(substring) Push $R3 # $R3=strlen(substring)
Push $R4 ; $R4=count Push $R4 # $R4=count
Push $R5 ; $R5=tmp Push $R5 # $R5=tmp
StrLen $R3 $R1 ; Get the length of the Search String StrLen $R3 $R1 # Get the length of the Search String
StrCpy $R4 0 ; Set the counter to 0 StrCpy $R4 0 # Set the counter to 0
loop: loop:
StrCpy $R5 $R2 $R3 $R4 ; Create a moving window of the string that is StrCpy $R5 $R2 $R3 $R4 # Create a moving window of the string that is
; the size of the length of the search string # the size of the length of the search string
StrCmp $R5 $R1 done ; Is the contents of the window the same as StrCmp $R5 $R1 done # Is the contents of the window the same as
; search string, then done # search string, then done
StrCmp $R5 "" done ; Is the window empty, then done StrCmp $R5 "" done # Is the window empty, then done
IntOp $R4 $R4 + 1 ; Shift the windows one character IntOp $R4 $R4 + 1 # Shift the windows one character
Goto loop ; Repeat Goto loop # Repeat
done: done:
StrCpy $R1 $R2 "" $R4 StrCpy $R1 $R2 "" $R4
@ -498,7 +519,7 @@ Function ${un}StrStr
Pop $R4 Pop $R4
Pop $R3 Pop $R3
Pop $R2 Pop $R2
Exch $R1 ; $R1=old$R1, stack=[result,...] Exch $R1 # $R1=old$R1, stack=[result,...]
FunctionEnd FunctionEnd
!macroend !macroend
@ -506,74 +527,74 @@ FunctionEnd
!insertmacro StrStr "un." !insertmacro StrStr "un."
;------------------------------------------------------------------------------ #------------------------------------------------------------------------------
; AddToPath Function # AddToPath Function
; - Adds item to Path for All Users # - Adds item to Path for All Users
; - Overcomes NSIS ReadRegStr limitation of 1024 characters by using Native # - Overcomes NSIS ReadRegStr limitation of 1024 characters by using Native
; Windows Commands # Windows Commands
; #
; Usage: # Usage:
; Push "C:\path\to\add" # Push "C:\path\to\add"
; Call AddToPath # Call AddToPath
;------------------------------------------------------------------------------ #------------------------------------------------------------------------------
!define Environ 'HKLM "SYSTEM\CurrentControlSet\Control\Session Manager\Environment"' !define Environ 'HKLM "SYSTEM\CurrentControlSet\Control\Session Manager\Environment"'
Function AddToPath Function AddToPath
Exch $0 ; Path to add Exch $0 # Path to add
Push $1 ; Current Path Push $1 # Current Path
Push $2 ; Results of StrStr / Length of Path + Path to Add Push $2 # Results of StrStr / Length of Path + Path to Add
Push $3 ; Handle to Reg / Length of Path Push $3 # Handle to Reg / Length of Path
Push $4 ; Result of Registry Call Push $4 # Result of Registry Call
; Open a handle to the key in the registry, handle in $3, Error in $4 # Open a handle to the key in the registry, handle in $3, Error in $4
System::Call "advapi32::RegOpenKey(i 0x80000002, t'SYSTEM\CurrentControlSet\Control\Session Manager\Environment', *i.r3) i.r4" System::Call "advapi32::RegOpenKey(i 0x80000002, t'SYSTEM\CurrentControlSet\Control\Session Manager\Environment', *i.r3) i.r4"
; Make sure registry handle opened successfully (returned 0) # Make sure registry handle opened successfully (returned 0)
IntCmp $4 0 0 done done IntCmp $4 0 0 done done
; Load the contents of path into $1, Error Code into $4, Path length into $2 # Load the contents of path into $1, Error Code into $4, Path length into $2
System::Call "advapi32::RegQueryValueEx(i $3, t'PATH', i 0, i 0, t.r1, *i ${NSIS_MAX_STRLEN} r2) i.r4" System::Call "advapi32::RegQueryValueEx(i $3, t'PATH', i 0, i 0, t.r1, *i ${NSIS_MAX_STRLEN} r2) i.r4"
; Close the handle to the registry ($3) # Close the handle to the registry ($3)
System::Call "advapi32::RegCloseKey(i $3)" System::Call "advapi32::RegCloseKey(i $3)"
; Check for Error Code 234, Path too long for the variable # Check for Error Code 234, Path too long for the variable
IntCmp $4 234 0 +4 +4 ; $4 == ERROR_MORE_DATA IntCmp $4 234 0 +4 +4 # $4 == ERROR_MORE_DATA
DetailPrint "AddToPath Failed: original length $2 > ${NSIS_MAX_STRLEN}" DetailPrint "AddToPath Failed: original length $2 > ${NSIS_MAX_STRLEN}"
MessageBox MB_OK \ MessageBox MB_OK \
"You may add C:\salt to the %PATH% for convenience when issuing local salt commands from the command line." \ "You may add C:\salt to the %PATH% for convenience when issuing local salt commands from the command line." \
/SD IDOK /SD IDOK
Goto done Goto done
; If no error, continue # If no error, continue
IntCmp $4 0 +5 ; $4 != NO_ERROR IntCmp $4 0 +5 # $4 != NO_ERROR
; Error 2 means the Key was not found # Error 2 means the Key was not found
IntCmp $4 2 +3 ; $4 != ERROR_FILE_NOT_FOUND IntCmp $4 2 +3 # $4 != ERROR_FILE_NOT_FOUND
DetailPrint "AddToPath: unexpected error code $4" DetailPrint "AddToPath: unexpected error code $4"
Goto done Goto done
StrCpy $1 "" StrCpy $1 ""
; Check if already in PATH # Check if already in PATH
Push "$1;" ; The string to search Push "$1;" # The string to search
Push "$0;" ; The string to find Push "$0;" # The string to find
Call StrStr Call StrStr
Pop $2 ; The result of the search Pop $2 # The result of the search
StrCmp $2 "" 0 done ; String not found, try again with ';' at the end StrCmp $2 "" 0 done # String not found, try again with ';' at the end
; Otherwise, it's already in the path # Otherwise, it's already in the path
Push "$1;" ; The string to search Push "$1;" # The string to search
Push "$0\;" ; The string to find Push "$0\;" # The string to find
Call StrStr Call StrStr
Pop $2 ; The result Pop $2 # The result
StrCmp $2 "" 0 done ; String not found, continue (add) StrCmp $2 "" 0 done # String not found, continue (add)
; Otherwise, it's already in the path # Otherwise, it's already in the path
; Prevent NSIS string overflow # Prevent NSIS string overflow
StrLen $2 $0 ; Length of path to add ($2) StrLen $2 $0 # Length of path to add ($2)
StrLen $3 $1 ; Length of current path ($3) StrLen $3 $1 # Length of current path ($3)
IntOp $2 $2 + $3 ; Length of current path + path to add ($2) IntOp $2 $2 + $3 # Length of current path + path to add ($2)
IntOp $2 $2 + 2 ; Account for the additional ';' IntOp $2 $2 + 2 # Account for the additional ';'
; $2 = strlen(dir) + strlen(PATH) + sizeof(";") # $2 = strlen(dir) + strlen(PATH) + sizeof(";")
; Make sure the new length isn't over the NSIS_MAX_STRLEN # Make sure the new length isn't over the NSIS_MAX_STRLEN
IntCmp $2 ${NSIS_MAX_STRLEN} +4 +4 0 IntCmp $2 ${NSIS_MAX_STRLEN} +4 +4 0
DetailPrint "AddToPath: new length $2 > ${NSIS_MAX_STRLEN}" DetailPrint "AddToPath: new length $2 > ${NSIS_MAX_STRLEN}"
MessageBox MB_OK \ MessageBox MB_OK \
@ -581,18 +602,18 @@ Function AddToPath
/SD IDOK /SD IDOK
Goto done Goto done
; Append dir to PATH # Append dir to PATH
DetailPrint "Add to PATH: $0" DetailPrint "Add to PATH: $0"
StrCpy $2 $1 1 -1 ; Copy the last character of the existing path StrCpy $2 $1 1 -1 # Copy the last character of the existing path
StrCmp $2 ";" 0 +2 ; Check for trailing ';' StrCmp $2 ";" 0 +2 # Check for trailing ';'
StrCpy $1 $1 -1 ; remove trailing ';' StrCpy $1 $1 -1 # remove trailing ';'
StrCmp $1 "" +2 ; Make sure Path is not empty StrCmp $1 "" +2 # Make sure Path is not empty
StrCpy $0 "$1;$0" ; Append new path at the end ($0) StrCpy $0 "$1;$0" # Append new path at the end ($0)
; We can use the NSIS command here. Only 'ReadRegStr' is affected # We can use the NSIS command here. Only 'ReadRegStr' is affected
WriteRegExpandStr ${Environ} "PATH" $0 WriteRegExpandStr ${Environ} "PATH" $0
; Broadcast registry change to open programs # Broadcast registry change to open programs
SendMessage ${HWND_BROADCAST} ${WM_WININICHANGE} 0 "STR:Environment" /TIMEOUT=5000 SendMessage ${HWND_BROADCAST} ${WM_WININICHANGE} 0 "STR:Environment" /TIMEOUT=5000
done: done:
@ -605,16 +626,16 @@ Function AddToPath
FunctionEnd FunctionEnd
;------------------------------------------------------------------------------ #------------------------------------------------------------------------------
; RemoveFromPath Function # RemoveFromPath Function
; - Removes item from Path for All Users # - Removes item from Path for All Users
; - Overcomes NSIS ReadRegStr limitation of 1024 characters by using Native # - Overcomes NSIS ReadRegStr limitation of 1024 characters by using Native
; Windows Commands # Windows Commands
; #
; Usage: # Usage:
; Push "C:\path\to\add" # Push "C:\path\to\add"
; Call RemoveFromPath # Call RemoveFromPath
;------------------------------------------------------------------------------ #------------------------------------------------------------------------------
!macro RemoveFromPath un !macro RemoveFromPath un
Function ${un}RemoveFromPath Function ${un}RemoveFromPath
@ -626,59 +647,59 @@ Function ${un}RemoveFromPath
Push $5 Push $5
Push $6 Push $6
; Open a handle to the key in the registry, handle in $3, Error in $4 # Open a handle to the key in the registry, handle in $3, Error in $4
System::Call "advapi32::RegOpenKey(i 0x80000002, t'SYSTEM\CurrentControlSet\Control\Session Manager\Environment', *i.r3) i.r4" System::Call "advapi32::RegOpenKey(i 0x80000002, t'SYSTEM\CurrentControlSet\Control\Session Manager\Environment', *i.r3) i.r4"
; Make sure registry handle opened successfully (returned 0) # Make sure registry handle opened successfully (returned 0)
IntCmp $4 0 0 done done IntCmp $4 0 0 done done
; Load the contents of path into $1, Error Code into $4, Path length into $2 # Load the contents of path into $1, Error Code into $4, Path length into $2
System::Call "advapi32::RegQueryValueEx(i $3, t'PATH', i 0, i 0, t.r1, *i ${NSIS_MAX_STRLEN} r2) i.r4" System::Call "advapi32::RegQueryValueEx(i $3, t'PATH', i 0, i 0, t.r1, *i ${NSIS_MAX_STRLEN} r2) i.r4"
; Close the handle to the registry ($3) # Close the handle to the registry ($3)
System::Call "advapi32::RegCloseKey(i $3)" System::Call "advapi32::RegCloseKey(i $3)"
; Check for Error Code 234, Path too long for the variable # Check for Error Code 234, Path too long for the variable
IntCmp $4 234 0 +4 +4 ; $4 == ERROR_MORE_DATA IntCmp $4 234 0 +4 +4 # $4 == ERROR_MORE_DATA
DetailPrint "AddToPath: original length $2 > ${NSIS_MAX_STRLEN}" DetailPrint "AddToPath: original length $2 > ${NSIS_MAX_STRLEN}"
Goto done Goto done
; If no error, continue # If no error, continue
IntCmp $4 0 +5 ; $4 != NO_ERROR IntCmp $4 0 +5 # $4 != NO_ERROR
; Error 2 means the Key was not found # Error 2 means the Key was not found
IntCmp $4 2 +3 ; $4 != ERROR_FILE_NOT_FOUND IntCmp $4 2 +3 # $4 != ERROR_FILE_NOT_FOUND
DetailPrint "AddToPath: unexpected error code $4" DetailPrint "AddToPath: unexpected error code $4"
Goto done Goto done
StrCpy $1 "" StrCpy $1 ""
; Ensure there's a trailing ';' # Ensure there's a trailing ';'
StrCpy $5 $1 1 -1 ; Copy the last character of the path StrCpy $5 $1 1 -1 # Copy the last character of the path
StrCmp $5 ";" +2 ; Check for trailing ';', if found continue StrCmp $5 ";" +2 # Check for trailing ';', if found continue
StrCpy $1 "$1;" ; ensure trailing ';' StrCpy $1 "$1;" # ensure trailing ';'
; Check for our directory inside the path # Check for our directory inside the path
Push $1 ; String to Search Push $1 # String to Search
Push "$0;" ; Dir to Find Push "$0;" # Dir to Find
Call ${un}StrStr Call ${un}StrStr
Pop $2 ; The results of the search Pop $2 # The results of the search
StrCmp $2 "" done ; If results are empty, we're done, otherwise continue StrCmp $2 "" done # If results are empty, we're done, otherwise continue
; Remove our Directory from the Path # Remove our Directory from the Path
DetailPrint "Remove from PATH: $0" DetailPrint "Remove from PATH: $0"
StrLen $3 "$0;" ; Get the length of our dir ($3) StrLen $3 "$0;" # Get the length of our dir ($3)
StrLen $4 $2 ; Get the length of the return from StrStr ($4) StrLen $4 $2 # Get the length of the return from StrStr ($4)
StrCpy $5 $1 -$4 ; $5 is now the part before the path to remove StrCpy $5 $1 -$4 # $5 is now the part before the path to remove
StrCpy $6 $2 "" $3 ; $6 is now the part after the path to remove StrCpy $6 $2 "" $3 # $6 is now the part after the path to remove
StrCpy $3 "$5$6" ; Combine $5 and $6 StrCpy $3 "$5$6" # Combine $5 and $6
; Check for Trailing ';' # Check for Trailing ';'
StrCpy $5 $3 1 -1 ; Load the last character of the string StrCpy $5 $3 1 -1 # Load the last character of the string
StrCmp $5 ";" 0 +2 ; Check for ';' StrCmp $5 ";" 0 +2 # Check for ';'
StrCpy $3 $3 -1 ; remove trailing ';' StrCpy $3 $3 -1 # remove trailing ';'
; Write the new path to the registry # Write the new path to the registry
WriteRegExpandStr ${Environ} "PATH" $3 WriteRegExpandStr ${Environ} "PATH" $3
; Broadcast the change to all open applications # Broadcast the change to all open applications
SendMessage ${HWND_BROADCAST} ${WM_WININICHANGE} 0 "STR:Environment" /TIMEOUT=5000 SendMessage ${HWND_BROADCAST} ${WM_WININICHANGE} 0 "STR:Environment" /TIMEOUT=5000
done: done:
@ -715,6 +736,7 @@ Function getMinionConfig
confFound: confFound:
FileOpen $0 "$INSTDIR\conf\minion" r FileOpen $0 "$INSTDIR\conf\minion" r
ClearErrors
confLoop: confLoop:
FileRead $0 $1 FileRead $0 $1
IfErrors EndOfFile IfErrors EndOfFile
@ -745,64 +767,64 @@ FunctionEnd
Function updateMinionConfig Function updateMinionConfig
ClearErrors ClearErrors
FileOpen $0 "$INSTDIR\conf\minion" "r" ; open target file for reading FileOpen $0 "$INSTDIR\conf\minion" "r" # open target file for reading
GetTempFileName $R0 ; get new temp file name GetTempFileName $R0 # get new temp file name
FileOpen $1 $R0 "w" ; open temp file for writing FileOpen $1 $R0 "w" # open temp file for writing
loop: ; loop through each line loop: # loop through each line
FileRead $0 $2 ; read line from target file FileRead $0 $2 # read line from target file
IfErrors done ; end if errors are encountered (end of line) IfErrors done # end if errors are encountered (end of line)
${If} $MasterHost_State != "" ; if master is empty ${If} $MasterHost_State != "" # if master is empty
${AndIf} $MasterHost_State != "salt" ; and if master is not 'salt' ${AndIf} $MasterHost_State != "salt" # and if master is not 'salt'
${StrLoc} $3 $2 "master:" ">" ; where is 'master:' in this line ${StrLoc} $3 $2 "master:" ">" # where is 'master:' in this line
${If} $3 == 0 ; is it in the first... ${If} $3 == 0 # is it in the first...
${OrIf} $3 == 1 ; or second position (account for comments) ${OrIf} $3 == 1 # or second position (account for comments)
StrCpy $2 "master: $MasterHost_State$\r$\n" ; write the master StrCpy $2 "master: $MasterHost_State$\r$\n" # write the master
${EndIf} ; close if statement ${EndIf} # close if statement
${EndIf} ; close if statement ${EndIf} # close if statement
${If} $MinionName_State != "" ; if minion is empty ${If} $MinionName_State != "" # if minion is empty
${AndIf} $MinionName_State != "hostname" ; and if minion is not 'hostname' ${AndIf} $MinionName_State != "hostname" # and if minion is not 'hostname'
${StrLoc} $3 $2 "id:" ">" ; where is 'id:' in this line ${StrLoc} $3 $2 "id:" ">" # where is 'id:' in this line
${If} $3 == 0 ; is it in the first... ${If} $3 == 0 # is it in the first...
${OrIf} $3 == 1 ; or the second position (account for comments) ${OrIf} $3 == 1 # or the second position (account for comments)
StrCpy $2 "id: $MinionName_State$\r$\n" ; change line StrCpy $2 "id: $MinionName_State$\r$\n" # change line
${EndIf} ; close if statement ${EndIf} # close if statement
${EndIf} ; close if statement ${EndIf} # close if statement
FileWrite $1 $2 ; write changed or unchanged line to temp file FileWrite $1 $2 # write changed or unchanged line to temp file
Goto loop Goto loop
done: done:
FileClose $0 ; close target file FileClose $0 # close target file
FileClose $1 ; close temp file FileClose $1 # close temp file
Delete "$INSTDIR\conf\minion" ; delete target file Delete "$INSTDIR\conf\minion" # delete target file
CopyFiles /SILENT $R0 "$INSTDIR\conf\minion" ; copy temp file to target file CopyFiles /SILENT $R0 "$INSTDIR\conf\minion" # copy temp file to target file
Delete $R0 ; delete temp file Delete $R0 # delete temp file
FunctionEnd FunctionEnd
Function parseCommandLineSwitches Function parseCommandLineSwitches
; Load the parameters # Load the parameters
${GetParameters} $R0 ${GetParameters} $R0
; Check for start-minion switches # Check for start-minion switches
; /start-service is to be deprecated, so we must check for both # /start-service is to be deprecated, so we must check for both
${GetOptions} $R0 "/start-service=" $R1 ${GetOptions} $R0 "/start-service=" $R1
${GetOptions} $R0 "/start-minion=" $R2 ${GetOptions} $R0 "/start-minion=" $R2
# Service: Start Salt Minion # Service: Start Salt Minion
${IfNot} $R2 == "" ${IfNot} $R2 == ""
; If start-minion was passed something, then set it # If start-minion was passed something, then set it
StrCpy $StartMinion $R2 StrCpy $StartMinion $R2
${ElseIfNot} $R1 == "" ${ElseIfNot} $R1 == ""
; If start-service was passed something, then set it # If start-service was passed something, then set it
StrCpy $StartMinion $R1 StrCpy $StartMinion $R1
${Else} ${Else}
; Otherwise default to 1 # Otherwise default to 1
StrCpy $StartMinion 1 StrCpy $StartMinion 1
${EndIf} ${EndIf}