Updated installer script.

This commit is contained in:
LoRd_MuldeR 2012-10-21 20:28:44 +02:00
parent eb75c942ee
commit 16fc9f523f
2 changed files with 17 additions and 7 deletions

View File

@ -465,7 +465,11 @@ Section "-Create Shortcuts"
Delete "$SMPROGRAMS\$StartMenuFolder\*.pif" Delete "$SMPROGRAMS\$StartMenuFolder\*.pif"
Delete "$SMPROGRAMS\$StartMenuFolder\*.url" Delete "$SMPROGRAMS\$StartMenuFolder\*.url"
CreateShortCut "$SMPROGRAMS\$StartMenuFolder\LameXP.lnk" "$INSTDIR\LameXP.exe" "" "$INSTDIR\LameXP.exe" 0 !insertmacro GetExecutableName $R0
${StdUtils.ExecShellAsUser} $R1 "$INSTDIR" "$R0" ${StdUtils.Const.ISV_PinToTaskbar}
DetailPrint 'Pin to Taskbar: "$INSTDIR\$R0" -> $R1'
CreateShortCut "$SMPROGRAMS\$StartMenuFolder\LameXP.lnk" "$INSTDIR\$R0" "" "$INSTDIR\$R0" 0
CreateShortCut "$SMPROGRAMS\$StartMenuFolder\$(LAMEXP_LANG_LINK_LICENSE).lnk" "$INSTDIR\License.txt" CreateShortCut "$SMPROGRAMS\$StartMenuFolder\$(LAMEXP_LANG_LINK_LICENSE).lnk" "$INSTDIR\License.txt"
CreateShortCut "$SMPROGRAMS\$StartMenuFolder\$(LAMEXP_LANG_LINK_CHANGELOG).lnk" "$INSTDIR\Changelog.html" CreateShortCut "$SMPROGRAMS\$StartMenuFolder\$(LAMEXP_LANG_LINK_CHANGELOG).lnk" "$INSTDIR\Changelog.html"
CreateShortCut "$SMPROGRAMS\$StartMenuFolder\$(LAMEXP_LANG_LINK_TRANSLATE).lnk" "$INSTDIR\Translate.html" CreateShortCut "$SMPROGRAMS\$StartMenuFolder\$(LAMEXP_LANG_LINK_TRANSLATE).lnk" "$INSTDIR\Translate.html"
@ -482,7 +486,9 @@ SectionEnd
Section "-Update Registry" Section "-Update Registry"
!insertmacro PrintProgress "$(LAMEXP_LANG_STATUS_REGISTRY)" !insertmacro PrintProgress "$(LAMEXP_LANG_STATUS_REGISTRY)"
!insertmacro GetExecutableName $R0
WriteRegStr HKLM "${MyRegPath}" "InstallLocation" "$INSTDIR" WriteRegStr HKLM "${MyRegPath}" "InstallLocation" "$INSTDIR"
WriteRegStr HKLM "${MyRegPath}" "ExecutableName" "$R0"
WriteRegStr HKLM "${MyRegPath}" "UninstallString" '"$INSTDIR\Uninstall.exe"' WriteRegStr HKLM "${MyRegPath}" "UninstallString" '"$INSTDIR\Uninstall.exe"'
WriteRegStr HKLM "${MyRegPath}" "DisplayName" "LameXP" WriteRegStr HKLM "${MyRegPath}" "DisplayName" "LameXP"
SectionEnd SectionEnd
@ -496,9 +502,7 @@ Section "-Finished"
${EndIf} ${EndIf}
!endif !endif
; ---- POLL ---- DetailPrint "Almost there..."
; !insertmacro UAC_AsUser_ExecShell "" "http://mulder.brhack.net/temp/style_poll/" "" "" SW_SHOWNORMAL
; ---- POLL ----
SectionEnd SectionEnd
@ -510,7 +514,13 @@ Section "Uninstall"
SetOutPath "$INSTDIR" SetOutPath "$INSTDIR"
!insertmacro PrintProgress "$(LAMEXP_LANG_STATUS_UNINSTALL)" !insertmacro PrintProgress "$(LAMEXP_LANG_STATUS_UNINSTALL)"
ReadRegStr $R0 HKLM "${MyRegPath}" "ExecutableName"
${IfThen} "$R0" == "" ${|} StrCpy $R0 "LameXP.exe" ${|}
${StdUtils.ExecShellAsUser} $R1 "$INSTDIR" "$R0" ${StdUtils.Const.ISV_UnpinFromTaskbar}
DetailPrint 'Unpin from Taskbar: "$INSTDIR\$R0" -> $R1'
Delete /REBOOTOK "$INSTDIR\LameXP.exe" Delete /REBOOTOK "$INSTDIR\LameXP.exe"
Delete /REBOOTOK "$INSTDIR\$R0"
Delete /REBOOTOK "$INSTDIR\LameXP-Portable.exe" Delete /REBOOTOK "$INSTDIR\LameXP-Portable.exe"
Delete /REBOOTOK "$INSTDIR\LameXP.exe.sig" Delete /REBOOTOK "$INSTDIR\LameXP.exe.sig"
Delete /REBOOTOK "$INSTDIR\LameXP*" Delete /REBOOTOK "$INSTDIR\LameXP*"

View File

@ -29,8 +29,8 @@
#define VER_LAMEXP_MINOR_HI 0 #define VER_LAMEXP_MINOR_HI 0
#define VER_LAMEXP_MINOR_LO 6 #define VER_LAMEXP_MINOR_LO 6
#define VER_LAMEXP_TYPE RC #define VER_LAMEXP_TYPE RC
#define VER_LAMEXP_PATCH 1 #define VER_LAMEXP_PATCH 2
#define VER_LAMEXP_BUILD 1154 #define VER_LAMEXP_BUILD 1156
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
// Tool versions (minimum expected versions!) // Tool versions (minimum expected versions!)