From 11781e8a8d28bd10dabf3b1aa7edd6640da4b959 Mon Sep 17 00:00:00 2001
From: lordmulder <mulder2@gmx.de>
Date: Sat, 8 Oct 2011 19:34:24 +0200
Subject: [PATCH] Clean-up installer script.

---
 etc/NSIS/setup.nsi | 41 ++---------------------------------------
 src/Config.h       |  2 +-
 2 files changed, 3 insertions(+), 40 deletions(-)

diff --git a/etc/NSIS/setup.nsi b/etc/NSIS/setup.nsi
index 7c30405c..4dd6b7d4 100644
--- a/etc/NSIS/setup.nsi
+++ b/etc/NSIS/setup.nsi
@@ -382,47 +382,10 @@ Function _CreateWebLink
 	SetFileAttributes "$0" FILE_ATTRIBUTE_READONLY
 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
 	${StdUtils.GetParameter} ${OutVar} "Update" ""
-	StrCmp ${OutVar} "" 0 +2
-	StrCpy ${OutVar} "LameXP.exe"
+	${StdUtils.TrimStr} ${OutVar}
+	${IfThen} "${OutVar}" == "" ${|} StrCpy ${OutVar} "LameXP.exe" ${|}
 !macroend
 
 !macro DisableNextButton TmpVar
diff --git a/src/Config.h b/src/Config.h
index c37d68fd..8d037cd5 100644
--- a/src/Config.h
+++ b/src/Config.h
@@ -30,7 +30,7 @@
 #define VER_LAMEXP_MINOR_LO					3
 #define VER_LAMEXP_TYPE						Beta
 #define VER_LAMEXP_PATCH					3
-#define VER_LAMEXP_BUILD					721
+#define VER_LAMEXP_BUILD					722
 
 ///////////////////////////////////////////////////////////////////////////////
 // Tools versions
-- 
2.11.0