Clean-up installer script.

This commit is contained in:
LoRd_MuldeR 2011-10-08 19:34:24 +02:00
parent ba72c43108
commit 11781e8a8d
2 changed files with 3 additions and 40 deletions

View File

@ -382,47 +382,10 @@ Function _CreateWebLink
SetFileAttributes "$0" FILE_ATTRIBUTE_READONLY SetFileAttributes "$0" FILE_ATTRIBUTE_READONLY
FunctionEnd FunctionEnd
!macro TrimStr VarName
Push ${VarName}
Call _TrimStr
Pop ${VarName}
!macroend
Function _TrimStr
Exch $R1
Push $R2
TrimLoop1:
StrCpy $R2 "$R1" 1
StrCmp "$R2" " " TrimLeft
StrCmp "$R2" "$\r" TrimLeft
StrCmp "$R2" "$\n" TrimLeft
StrCmp "$R2" "$\t" TrimLeft
Goto TrimLoop2
TrimLeft:
StrCpy $R1 "$R1" "" 1
Goto TrimLoop1
TrimLoop2:
StrCpy $R2 "$R1" 1 -1
StrCmp "$R2" " " TrimRight
StrCmp "$R2" "$\r" TrimRight
StrCmp "$R2" "$\n" TrimRight
StrCmp "$R2" "$\t" TrimRight
Goto TrimDone
TrimRight:
StrCpy $R1 "$R1" -1
Goto TrimLoop2
TrimDone:
Pop $R2
Exch $R1
FunctionEnd
!macro GetExecutableName OutVar !macro GetExecutableName OutVar
${StdUtils.GetParameter} ${OutVar} "Update" "" ${StdUtils.GetParameter} ${OutVar} "Update" ""
StrCmp ${OutVar} "" 0 +2 ${StdUtils.TrimStr} ${OutVar}
StrCpy ${OutVar} "LameXP.exe" ${IfThen} "${OutVar}" == "" ${|} StrCpy ${OutVar} "LameXP.exe" ${|}
!macroend !macroend
!macro DisableNextButton TmpVar !macro DisableNextButton TmpVar

View File

@ -30,7 +30,7 @@
#define VER_LAMEXP_MINOR_LO 3 #define VER_LAMEXP_MINOR_LO 3
#define VER_LAMEXP_TYPE Beta #define VER_LAMEXP_TYPE Beta
#define VER_LAMEXP_PATCH 3 #define VER_LAMEXP_PATCH 3
#define VER_LAMEXP_BUILD 721 #define VER_LAMEXP_BUILD 722
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
// Tools versions // Tools versions