OSDN Git Service

Updated installer script to use the ${StdUtils.TestParameter} function.
authorLoRd_MuldeR <mulder2@gmx.de>
Wed, 1 Jul 2015 20:47:47 +0000 (22:47 +0200)
committerLoRd_MuldeR <mulder2@gmx.de>
Wed, 1 Jul 2015 20:47:47 +0000 (22:47 +0200)
etc/NSIS/setup.nsi
src/Config.h

index 3f179cf..11f962d 100644 (file)
@@ -305,27 +305,27 @@ UninstPage Custom un.LockedListShow
 
 
 ;--------------------------------
-;LogicLib Support
+;LogicLib Extensions
 ;--------------------------------
 
 !macro _UnattendedMode _a _b _t _f
-  !insertmacro _LOGICLIB_TEMP
-  ${StdUtils.GetParameter} $_LOGICLIB_TEMP "Update" "?#@!"
-  StrCmp "$_LOGICLIB_TEMP" "?#@!" `${_f}` `${_t}`
+       !insertmacro _LOGICLIB_TEMP
+       ${StdUtils.TestParameter} $_LOGICLIB_TEMP "Update"
+       StrCmp "$_LOGICLIB_TEMP" "true" `${_t}` `${_f}`
 !macroend
 !define UnattendedMode `"" UnattendedMode ""`
 
 !macro _ForcedMode _a _b _t _f
-  !insertmacro _LOGICLIB_TEMP
-  ${StdUtils.GetParameter} $_LOGICLIB_TEMP "Force" "?#@!"
-  StrCmp "$_LOGICLIB_TEMP" "?#@!" `${_f}` `${_t}`
+       !insertmacro _LOGICLIB_TEMP
+       ${StdUtils.TestParameter} $_LOGICLIB_TEMP "Force"
+       StrCmp "$_LOGICLIB_TEMP" "true" `${_t}` `${_f}`
 !macroend
 !define ForcedMode `"" ForcedMode ""`
 
 !macro _ValidFileName _a _b _t _f
-  !insertmacro _LOGICLIB_TEMP
-  ${StdUtils.ValidFileName} $_LOGICLIB_TEMP `${_b}`
-  StrCmp "$_LOGICLIB_TEMP" "ok" `${_t}` `${_f}`
+       !insertmacro _LOGICLIB_TEMP
+       ${StdUtils.ValidFileName} $_LOGICLIB_TEMP `${_b}`
+       StrCmp "$_LOGICLIB_TEMP" "ok" `${_t}` `${_f}`
 !macroend
 !define ValidFileName `"" ValidFileName`
 
index b234be1..b450e18 100644 (file)
@@ -34,8 +34,8 @@
 #define VER_LAMEXP_MINOR_HI                                    1
 #define VER_LAMEXP_MINOR_LO                                    2
 #define VER_LAMEXP_TYPE                                                Alpha
-#define VER_LAMEXP_PATCH                                       8
-#define VER_LAMEXP_BUILD                                       1762
+#define VER_LAMEXP_PATCH                                       9
+#define VER_LAMEXP_BUILD                                       1763
 #define VER_LAMEXP_CONFG                                       1700
 
 ///////////////////////////////////////////////////////////////////////////////