From d2a29541880d88a73dd027aa02f431998ec108b6 Mon Sep 17 00:00:00 2001
From: lordmulder <mulder2@gmx.de>
Date: Sun, 27 Feb 2011 22:28:34 +0100
Subject: [PATCH] Updated installer script.

---
 doc/FAQ.html                  |  6 +++---
 etc/NSIS/setup.nsi            | 25 +++++++++++++++++++++++--
 etc/Translation/Blank.nsh     |  1 +
 etc/Translation/LameXP_DE.nsh |  1 +
 etc/Translation/LameXP_ES.nsh |  1 +
 etc/Translation/LameXP_RU.nsh |  1 +
 src/Config.h                  |  2 +-
 7 files changed, 31 insertions(+), 6 deletions(-)
diff --git a/doc/FAQ.html b/doc/FAQ.html
index 8230a106..ea4dbce1 100644
--- a/doc/FAQ.html
+++ b/doc/FAQ.html
@@ -7,7 +7,7 @@
 <body style="font-family:Monospace;font-size:10pt;">
 <h3>LameXP - Frequently Asked Questions (FAQ)</h3><br>
 
-<a name=""><b>What is LameXP ???</b></a><br>
+<a name="6a0b023d"><b>What is LameXP ???</b></a><br>
 <br>
 LameXP is a graphical user-interface for a number of audio encoders. It was developed to support a huge<br>
 number of input formats. File formats are detected reliably using MediaInfo. Compressed audio formats are<br>
@@ -20,7 +20,7 @@ any ACM Codecs or DirectShow/DMO filters! And it will NOT install anything of th
 
 <br><br>
 
-<a name=""><b>What platforms does LameXP run on?</b></a><br>
+<a name="be0a8459"><b>What platforms does LameXP run on?</b></a><br>
 <br>
 LameXP is currently being developed and tested on the following platforms:<br><ul>
 <li>Microsoft Windows XP, Service Pack 3
@@ -40,7 +40,7 @@ The following platforms are NOT supported any longer:<br><ul>
 
 <br><br>
 
-<a name=""><b>What output formats (encoders) does LameXP support?</b></a><br>
+<a name="29065b86"><b>What output formats (encoders) does LameXP support?</b></a><br>
 <br>
 Currently the following output formats are supported by LameXP:<br><ul>
 <li>MPEG Audio-Layer III (MP3), using the LAME encoder [built-in]
diff --git a/etc/NSIS/setup.nsi b/etc/NSIS/setup.nsi
index d7786e2c..0a7ae36f 100644
--- a/etc/NSIS/setup.nsi
+++ b/etc/NSIS/setup.nsi
@@ -51,6 +51,22 @@
 ;Web-Site
 !define MyWebSite "http://mulder.dummwiedeutsch.de/"
 
+
+;--------------------------------
+;Check for Pre-Release
+;--------------------------------
+
+!define LAMEXP_IS_PRERELEASE
+!searchparse '${LAMEXP_SUFFIX}' '' LAMEXP_INSTTYPE '-' LAMEXP_IGNORE
+
+!if '${LAMEXP_INSTTYPE}' == 'Final'
+  !undef LAMEXP_IS_PRERELEASE
+!endif
+!if '${LAMEXP_INSTTYPE}' == 'Hotfix'
+  !undef LAMEXP_IS_PRERELEASE
+!endif
+
+
 ;--------------------------------
 ;Includes
 ;--------------------------------
@@ -294,6 +310,13 @@ Function MyUacInit
 		MessageBox MB_ICONSTOP|MB_TOPMOST|MB_SETFOREGROUND "Unable to elevate installer! (Error code: $0)"
 		Quit
 	${EndSwitch}
+	
+	!ifdef LAMEXP_IS_PRERELEASE
+		!insertmacro GetCommandlineParameter "Update" "?" $R0
+		StrCmp $R0 "?" 0 +3
+		MessageBox MB_TOPMOST|MB_ICONEXCLAMATION|MB_OKCANCEL "$(LAMEXP_LANG_PRERELEASE_WARNING)" /SD IDOK IDOK +2
+		Abort
+	!endif
 FunctionEnd
 
 Function un.MyUacInit
@@ -581,8 +604,6 @@ Function RunAppFunction
 FunctionEnd
 
 Function ShowReadmeFunction
-	!insertmacro UAC_AsUser_ExecShell "open" "$INSTDIR\Changelog.html" "" "" SW_SHOWNORMAL
 	!insertmacro UAC_AsUser_ExecShell "open" "$INSTDIR\FAQ.html" "" "" SW_SHOWNORMAL
-	!insertmacro UAC_AsUser_ExecShell "open" "$INSTDIR\Translate.html" "" "" SW_SHOWNORMAL
 FunctionEnd
 
diff --git a/etc/Translation/Blank.nsh b/etc/Translation/Blank.nsh
index 689749b3..cb5a656f 100644
--- a/etc/Translation/Blank.nsh
+++ b/etc/Translation/Blank.nsh
@@ -38,3 +38,4 @@ LangString LAMEXP_LANG_LINK_CHANGELOG      ${LANG_ENGLISH} "Version History"
 LangString LAMEXP_LANG_LINK_TRANSLATE      ${LANG_ENGLISH} "Translator's Guide"
 LangString LAMEXP_LANG_LINK_UNINSTALL      ${LANG_ENGLISH} "Uninstall"
 LangString LAMEXP_LANG_LINK_FAQ            ${LANG_ENGLISH} "Frequently Asked Questions"
+LangString LAMEXP_LANG_PRERELEASE_WARNING  ${LANG_ENGLISH} "You are about to install a Demo (pre-release) version of LameXP!"
diff --git a/etc/Translation/LameXP_DE.nsh b/etc/Translation/LameXP_DE.nsh
index 6ed6eb42..f7d7691e 100644
--- a/etc/Translation/LameXP_DE.nsh
+++ b/etc/Translation/LameXP_DE.nsh
@@ -38,3 +38,4 @@ LangString LAMEXP_LANG_LINK_CHANGELOG      ${LANG_GERMAN} "Versionshistorie"
 LangString LAMEXP_LANG_LINK_TRANSLATE      ${LANG_GERMAN} "Leitfaden f�r �bersetzer"
 LangString LAMEXP_LANG_LINK_UNINSTALL      ${LANG_GERMAN} "Deinstallieren"
 LangString LAMEXP_LANG_LINK_FAQ            ${LANG_GERMAN} "H�ufig Gestellte Fragen"
+LangString LAMEXP_LANG_PRERELEASE_WARNING  ${LANG_GERMAN} "Sie sind dabei eine Demo-Version von LameXP zu installieren!"
diff --git a/etc/Translation/LameXP_ES.nsh b/etc/Translation/LameXP_ES.nsh
index 8244a1a4..7aabbe88 100644
--- a/etc/Translation/LameXP_ES.nsh
+++ b/etc/Translation/LameXP_ES.nsh
@@ -38,3 +38,4 @@ LangString LAMEXP_LANG_LINK_CHANGELOG      ${LANG_SPANISH} "Historial de version
 LangString LAMEXP_LANG_LINK_TRANSLATE      ${LANG_SPANISH} "Gu�a de traducci�n"
 LangString LAMEXP_LANG_LINK_UNINSTALL      ${LANG_SPANISH} "Desinstalar"
 LangString LAMEXP_LANG_LINK_FAQ            ${LANG_SPANISH} "Preguntas frecuentes"
+LangString LAMEXP_LANG_PRERELEASE_WARNING  ${LANG_SPANISH} "You are about to install a Demo (pre-release) version of LameXP!"
diff --git a/etc/Translation/LameXP_RU.nsh b/etc/Translation/LameXP_RU.nsh
index b954e5df..8a85ec71 100644
--- a/etc/Translation/LameXP_RU.nsh
+++ b/etc/Translation/LameXP_RU.nsh
@@ -38,3 +38,4 @@ LangString LAMEXP_LANG_LINK_CHANGELOG      ${LANG_RUSSIAN} "История ве
 LangString LAMEXP_LANG_LINK_TRANSLATE      ${LANG_RUSSIAN} "Руководство Переводчика"
 LangString LAMEXP_LANG_LINK_UNINSTALL      ${LANG_RUSSIAN} "Деинсталляция"
 LangString LAMEXP_LANG_LINK_FAQ            ${LANG_RUSSIAN} "Часто Задаваемые Вопросы"
+LangString LAMEXP_LANG_PRERELEASE_WARNING  ${LANG_RUSSIAN} "You are about to install a Demo (pre-release) version of LameXP!"
diff --git a/src/Config.h b/src/Config.h
index 41590f64..c22db500 100644
--- a/src/Config.h
+++ b/src/Config.h
@@ -25,7 +25,7 @@
 #define VER_LAMEXP_MAJOR				4
 #define VER_LAMEXP_MINOR_HI				0
 #define VER_LAMEXP_MINOR_LO				1
-#define VER_LAMEXP_BUILD				339
+#define VER_LAMEXP_BUILD				341
 #define VER_LAMEXP_SUFFIX				Beta-3
 
 /*
