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 #22762 from twangboy/fix_installer

Browse source 
Fixed version not showing in Add/Remove Programs
This commit is contained in:
Justin Findlay 2015-04-16 22:29:46 -06:00
commit 54c45845ab
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkg/windows/BuildSalt.bat
View file

@ -79,6 +79,6 @@ makensis.exe /DSaltVersion="%Version%" "%InsDir%\Salt-Minion-Setup.nsi"
@ echo Installation file can be found in the following directory:
@ echo %InsDir%
done:
:done
if [%Version%] == [] pause
cls

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

@ -1,5 +1,4 @@
!define PRODUCT_NAME "Salt Minion"
!define PRODUCT_VERSION "{{ salt_version }}"
!define PRODUCT_PUBLISHER "SaltStack, Inc"
!define PRODUCT_WEB_SITE "http://saltstack.org"
!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\salt-minion.exe"
@ -17,6 +16,12 @@
${StrLoc}
${StrStrAdv}
!ifdef SaltVersion
!define PRODUCT_VERSION ${SaltVersion}
!else
!define PRODUCT_VERSION "Undefined Version"
!endif
!if "$%PROCESSOR_ARCHITECTURE%" == "AMD64"
!define CPUARCH "AMD64"
!else if "$%PROCESSOR_ARCHITEW6432%" == "AMD64"
@ -148,13 +153,8 @@ Function MsiQueryProductState
FunctionEnd
!ifdef SaltVersion
Name "${PRODUCT_NAME} ${SaltVersion}"
OutFile "Salt-Minion-${SaltVersion}-${CPUARCH}-Setup.exe"
!else
Name "${PRODUCT_NAME} ${PRODUCT_VERSION}"
OutFile "Salt-Minion-${PRODUCT_VERSION}-${CPUARCH}-Setup.exe"
!endif
Name "${PRODUCT_NAME} ${PRODUCT_VERSION}"
OutFile "Salt-Minion-${PRODUCT_VERSION}-${CPUARCH}-Setup.exe"
InstallDir "c:\salt"
InstallDirRegKey HKLM "${PRODUCT_DIR_REGKEY}" ""
ShowInstDetails show