Menu
▾
▴
[popfile-commit] windows installer.nsi,1.83,1.84
|
From: <xue...@us...> - 2003-07-09 14:01:50
|
Update of /cvsroot/popfile/windows
In directory sc8-pr-cvs1:/tmp/cvs-serv22181
Modified Files:
installer.nsi
Log Message:
New NSIS compiler means language string handling can be greatly simplified, and Bulgarian & Danish can be supported again.
Index: installer.nsi
===================================================================
RCS file: /cvsroot/popfile/windows/installer.nsi,v
retrieving revision 1.83
retrieving revision 1.84
diff -C2 -d -r1.83 -r1.84
*** installer.nsi 8 Jul 2003 08:16:22 -0000 1.83
--- installer.nsi 9 Jul 2003 13:01:58 -0000 1.84
***************
*** 10,24 ****
#--------------------------------------------------------------------------
! ; Modified to work with NSIS 2.0b4 (CVS) [ MAKENSIS.EXE dated 28 June 2003 @ 06:44 or later ]
- #--------------------------------------------------------------------------
- # WARNINGS:
- #
- # (1) This script requires "NSIS Modern User Interface" version 1.65 (17 June 2003 or later)
- # because it uses the new (simplified) page configuration system.
- #
- # (2) This script must be compiled with MAKENSIS.EXE dated 28 June 2003 @ 06:44 (or later)
- # (earlier versions will crash while generating the language tables)
- #
#--------------------------------------------------------------------------
# LANGUAGE SUPPORT:
--- 10,29 ----
#--------------------------------------------------------------------------
! ; This script requires a version of NSIS 2.0b4 (CVS) which meets the following requirements:
! ;
! ; (1) "NSIS Modern User Interface" version 1.65 (17 June 2003 or later)
! ; This script uses the new (simplified) page configuration system and other improvements.
! ;
! ; (2) '{NSIS}\makensis.exe' dated 8 July 2003 @ 18:44 (NSIS CVS version 1.203) or later
! ; This is required to ensure that out-of-date NLF files do not result in blank messages
! ; and to ensure that language strings can be combined with other strings.
! ;
! ; (3) '{NSIS}\NSIS\Contrib\UIs\modern.exe' dated xx July @ xx:xx (NSIS CVS v1.xxx) or later
! ; This is required to ensure the installer works properly when 'Japanese' is selected.
!
! ; NSIS CVS snapshot 09 July 2003 @ 07:44 has a partial fix for the 'Japanese' bug - but wordwrap
! ; has not been enabled for the enlarged "Space required" field on the components page
! ; (applies to all three "Modern UI" EXE files)
#--------------------------------------------------------------------------
# LANGUAGE SUPPORT:
***************
*** 69,78 ****
# 'Languages' component to allow the installer to select the appropriate UI language.
#--------------------------------------------------------------------------
- # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- # At present (02 July 2003) support for 'Bulgarian' and 'Danish' has been disabled (as described
- # above) because in these two cases the corresponding NLF file is out-of-step and this could
- # result in wrong/missing messages during the installation.
- # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- #--------------------------------------------------------------------------
; POPFile constants have been given names beginning with 'C_' (eg C_README)
--- 74,77 ----
***************
*** 343,352 ****
; from this list. (To remove all of these languages, use /DENGLISH_ONLY on command-line)
! # [02 July 03] "Bulgarian" disabled because the main NSIS NLF language file is out of date
! # !insertmacro PFI_LANG_LOAD "Bulgarian" ; 'New style' license msgs missing (27-Jun-03)
!insertmacro PFI_LANG_LOAD "SimpChinese"
!insertmacro PFI_LANG_LOAD "TradChinese"
! # [02 July 03] "Danish" disabled because the main NSIS NLF language file is out of date
! # !insertmacro PFI_LANG_LOAD "Danish" ; 'New style' license msgs missing (27-Jun-03)
!insertmacro PFI_LANG_LOAD "Dutch"
!insertmacro PFI_LANG_LOAD "Finnish" ; 'New style' license msgs missing (27-Jun-03)
--- 342,349 ----
; from this list. (To remove all of these languages, use /DENGLISH_ONLY on command-line)
! !insertmacro PFI_LANG_LOAD "Bulgarian" ; 'New style' license msgs missing (27-Jun-03)
!insertmacro PFI_LANG_LOAD "SimpChinese"
!insertmacro PFI_LANG_LOAD "TradChinese"
! !insertmacro PFI_LANG_LOAD "Danish" ; 'New style' license msgs missing (27-Jun-03)
!insertmacro PFI_LANG_LOAD "Dutch"
!insertmacro PFI_LANG_LOAD "Finnish" ; 'New style' license msgs missing (27-Jun-03)
***************
*** 418,421 ****
--- 415,419 ----
!insertmacro MUI_INSTALLOPTIONS_EXTRACT_AS "${C_RELEASE_NOTES}" "release.txt"
+
FunctionEnd
***************
*** 431,445 ****
Function PFIGUIInit
- !define L_MSG $R9 ; holds assembled 'language' string
- !define L_TXT $R8 ; used when assembling 'language' strings
-
- Push ${L_MSG}
- Push ${L_TXT}
-
SearchPath ${G_NOTEPAD} notepad.exe
! StrCpy ${L_MSG} "$(PFI_LANG_MBRELNOTES_1)"
! StrCpy ${L_TXT} "$(PFI_LANG_MBRELNOTES_2)"
! StrCpy ${L_MSG} "${L_MSG}$\r$\n$\r$\n${L_TXT}"
! MessageBox MB_YESNO|MB_ICONQUESTION ${L_MSG} IDNO exit
StrCmp ${G_NOTEPAD} "" use_file_association
ExecWait 'notepad.exe "$PLUGINSDIR\release.txt"'
--- 429,435 ----
Function PFIGUIInit
SearchPath ${G_NOTEPAD} notepad.exe
! MessageBox MB_YESNO|MB_ICONQUESTION \
! "$(PFI_LANG_MBRELNOTES_1)$\r$\n$\r$\n$(PFI_LANG_MBRELNOTES_2)" IDNO exit
StrCmp ${G_NOTEPAD} "" use_file_association
ExecWait 'notepad.exe "$PLUGINSDIR\release.txt"'
***************
*** 458,466 ****
Call StartPOPFilePage_Init
- Pop ${L_TXT}
- Pop ${L_MSG}
-
- !undef L_MSG
- !undef L_TXT
FunctionEnd
--- 448,451 ----
***************
*** 476,485 ****
!define L_CFG $R9 ; file handle
- !define L_MSG $R8 ; assembled 'language' string
- !define L_TXT $R7 ; used when assembling 'language' string
Push ${L_CFG}
- Push ${L_MSG}
- Push ${L_TXT}
SetDetailsPrint textonly
--- 461,466 ----
***************
*** 523,536 ****
IfFileExists "$INSTDIR\stopwords" 0 copy_stopwords
! StrCpy ${L_MSG} "POPFile 'stopwords' "
! StrCpy ${L_TXT} "$(PFI_LANG_MBSTPWDS_1)"
! StrCpy ${L_MSG} "${L_MSG}${L_TXT}$\r$\n$\r$\n"
! StrCpy ${L_TXT} "$(PFI_LANG_MBSTPWDS_2)"
! StrCpy ${L_MSG} "${L_MSG}${L_TXT}$\r$\n$\r$\n"
! StrCpy ${L_TXT} "$(PFI_LANG_MBSTPWDS_3)"
! StrCpy ${L_MSG} "${L_MSG}${L_TXT} 'stopwords.bak')$\r$\n$\r$\n"
! StrCpy ${L_TXT} "$(PFI_LANG_MBSTPWDS_4)"
! StrCpy ${L_MSG} "${L_MSG}${L_TXT} 'stopwords.default')"
! MessageBox MB_YESNO|MB_ICONQUESTION ${L_MSG} IDNO copy_default_stopwords
IfFileExists "$INSTDIR\stopwords.bak" 0 make_backup
SetFileAttributes "$INSTDIR\stopwords.bak" NORMAL
--- 504,512 ----
IfFileExists "$INSTDIR\stopwords" 0 copy_stopwords
! MessageBox MB_YESNO|MB_ICONQUESTION \
! "POPFile 'stopwords' $(PFI_LANG_MBSTPWDS_1)$\r$\n$\r$\n\
! $(PFI_LANG_MBSTPWDS_2)$\r$\n$\r$\n\
! $(PFI_LANG_MBSTPWDS_3) 'stopwords.bak')$\r$\n$\r$\n\
! $(PFI_LANG_MBSTPWDS_4) 'stopwords.default')" IDNO copy_default_stopwords
IfFileExists "$INSTDIR\stopwords.bak" 0 make_backup
SetFileAttributes "$INSTDIR\stopwords.bak" NORMAL
***************
*** 552,563 ****
SetFileAttributes "$INSTDIR\popfile.cfg" NORMAL
IfFileExists "$INSTDIR\popfile.cfg.bak" 0 make_cfg_backup
! StrCpy ${L_MSG} "$(PFI_LANG_MBCFGBK_1)"
! StrCpy ${L_TXT} "$(PFI_LANG_MBCFGBK_2)"
! StrCpy ${L_MSG} "${L_MSG} 'popfile.cfg' ${L_TXT} ('popfile.cfg.bak').$\r$\n$\r$\n"
! StrCpy ${L_TXT} "$(PFI_LANG_MBCFGBK_3)"
! StrCpy ${L_MSG} "${L_MSG}${L_TXT}$\r$\n$\r$\n"
! StrCpy ${L_TXT} "$(PFI_LANG_MBCFGBK_4)"
! StrCpy ${L_MSG} "${L_MSG}${L_TXT}"
! MessageBox MB_YESNO|MB_ICONQUESTION "${L_MSG}" IDNO update_config
SetFileAttributes "$INSTDIR\popfile.cfg.bak" NORMAL
--- 528,536 ----
SetFileAttributes "$INSTDIR\popfile.cfg" NORMAL
IfFileExists "$INSTDIR\popfile.cfg.bak" 0 make_cfg_backup
! MessageBox MB_YESNO|MB_ICONQUESTION \
! "$(PFI_LANG_MBCFGBK_1) 'popfile.cfg' $(PFI_LANG_MBCFGBK_2) ('popfile.cfg.bak').\
! $\r$\n$\r$\n\
! $(PFI_LANG_MBCFGBK_3)$\r$\n$\r$\n\
! $(PFI_LANG_MBCFGBK_4)" IDNO update_config
SetFileAttributes "$INSTDIR\popfile.cfg.bak" NORMAL
***************
*** 742,752 ****
SetDetailsPrint listonly
- Pop ${L_TXT}
- Pop ${L_MSG}
Pop ${L_CFG}
!undef L_CFG
- !undef L_MSG
- !undef L_TXT
SectionEnd
--- 715,721 ----
***************
*** 822,831 ****
!insertmacro UI_LANG_CONFIG "ENGLISH" "English"
! # [02 July 03] "Bulgarian" disabled because the main NSIS NLF language file is out of date
! # !insertmacro UI_LANG_CONFIG "BULGARIAN" "Bulgarian"
!insertmacro UI_LANG_CONFIG "SIMPCHINESE" "Chinese-Simplified"
!insertmacro UI_LANG_CONFIG "TRADCHINESE" "Chinese-Traditional"
! # [02 July 03] "Danish" disabled because the main NSIS NLF language file is out of date
! # !insertmacro UI_LANG_CONFIG "DANISH" "Dansk"
!insertmacro UI_LANG_CONFIG "DUTCH" "Nederlands"
!insertmacro UI_LANG_CONFIG "FINNISH" "Suomi"
--- 791,798 ----
!insertmacro UI_LANG_CONFIG "ENGLISH" "English"
! !insertmacro UI_LANG_CONFIG "BULGARIAN" "Bulgarian"
!insertmacro UI_LANG_CONFIG "SIMPCHINESE" "Chinese-Simplified"
!insertmacro UI_LANG_CONFIG "TRADCHINESE" "Chinese-Traditional"
! !insertmacro UI_LANG_CONFIG "DANISH" "Dansk"
!insertmacro UI_LANG_CONFIG "DUTCH" "Nederlands"
!insertmacro UI_LANG_CONFIG "FINNISH" "Suomi"
***************
*** 929,934 ****
StrCmp ${L_OLD_GUI} "" try_other_port
! StrCpy ${L_RESULT} "$(PFI_LANG_INST_LOG_1)"
! DetailPrint "${L_RESULT} ${L_OLD_GUI}"
NSISdl::download_quiet http://127.0.0.1:${L_OLD_GUI}/shutdown "$PLUGINSDIR\shutdown.htm"
Sleep 250 ; milliseconds
--- 896,900 ----
StrCmp ${L_OLD_GUI} "" try_other_port
! DetailPrint "$(PFI_LANG_INST_LOG_1) ${L_OLD_GUI}"
NSISdl::download_quiet http://127.0.0.1:${L_OLD_GUI}/shutdown "$PLUGINSDIR\shutdown.htm"
Sleep 250 ; milliseconds
***************
*** 942,947 ****
StrCmp ${L_NEW_GUI} "" exit_now
! StrCpy ${L_RESULT} "$(PFI_LANG_INST_LOG_1)"
! DetailPrint "${L_RESULT} ${L_NEW_GUI}"
NSISdl::download_quiet http://127.0.0.1:${L_NEW_GUI}/shutdown "$PLUGINSDIR\shutdown.htm"
Sleep 250 ; milliseconds
--- 908,912 ----
StrCmp ${L_NEW_GUI} "" exit_now
! DetailPrint "$(PFI_LANG_INST_LOG_1) ${L_NEW_GUI}"
NSISdl::download_quiet http://127.0.0.1:${L_NEW_GUI}/shutdown "$PLUGINSDIR\shutdown.htm"
Sleep 250 ; milliseconds
***************
*** 1251,1261 ****
Function CheckPortOptions
! !define L_MSG $R9
! !define L_RESULT $R8
! !define L_TXT $R7
- Push ${L_MSG}
Push ${L_RESULT}
- Push ${L_TXT}
!insertmacro MUI_INSTALLOPTIONS_READ ${G_POP3} "ioA.ini" "Field 2" "State"
--- 1216,1222 ----
Function CheckPortOptions
! !define L_RESULT $R9
Push ${L_RESULT}
!insertmacro MUI_INSTALLOPTIONS_READ ${G_POP3} "ioA.ini" "Field 2" "State"
***************
*** 1271,1280 ****
bad_pop3:
! StrCpy ${L_MSG} "$(PFI_LANG_OPTIONS_MBPOP3_1)"
! StrCpy ${L_TXT} "$(PFI_LANG_OPTIONS_MBPOP3_2)"
! StrCpy ${L_MSG} "${L_MSG} $\"${G_POP3}$\"'.$\n$\n${L_TXT}$\n$\n"
! StrCpy ${L_TXT} "$(PFI_LANG_OPTIONS_MBPOP3_3)"
! StrCpy ${L_MSG} "${L_MSG}${L_TXT}"
! MessageBox MB_OK|MB_ICONEXCLAMATION ${L_MSG}
Goto bad_exit
--- 1232,1239 ----
bad_pop3:
! MessageBox MB_OK|MB_ICONEXCLAMATION \
! "$(PFI_LANG_OPTIONS_MBPOP3_1) $\"${G_POP3}$\"'.$\n$\n\
! $(PFI_LANG_OPTIONS_MBPOP3_2)$\n$\n\
! $(PFI_LANG_OPTIONS_MBPOP3_3)"
Goto bad_exit
***************
*** 1288,1304 ****
bad_gui:
! StrCpy ${L_MSG} "$(PFI_LANG_OPTIONS_MBGUI_1)"
! StrCpy ${L_TXT} "$(PFI_LANG_OPTIONS_MBGUI_2)"
! StrCpy ${L_MSG} "${L_MSG} $\"${G_GUI}$\".$\n$\n${L_TXT}$\n$\n"
! StrCpy ${L_TXT} "$(PFI_LANG_OPTIONS_MBGUI_3)"
! StrCpy ${L_MSG} "${L_MSG}${L_TXT}"
! MessageBox MB_OK|MB_ICONEXCLAMATION ${L_MSG}
Goto bad_exit
ports_must_differ:
! StrCpy ${L_MSG} "$(PFI_LANG_OPTIONS_MBDIFF_1)"
! StrCpy ${L_TXT} "$(PFI_LANG_OPTIONS_MBDIFF_2)"
! StrCpy ${L_MSG} "${L_MSG}$\n$\n${L_TXT}"
! MessageBox MB_OK|MB_ICONEXCLAMATION ${L_MSG}
bad_exit:
--- 1247,1260 ----
bad_gui:
! MessageBox MB_OK|MB_ICONEXCLAMATION \
! "$(PFI_LANG_OPTIONS_MBGUI_1) $\"${G_GUI}$\".$\n$\n\
! $(PFI_LANG_OPTIONS_MBGUI_2)$\n$\n\
! $(PFI_LANG_OPTIONS_MBGUI_3)"
Goto bad_exit
ports_must_differ:
! MessageBox MB_OK|MB_ICONEXCLAMATION \
! "$(PFI_LANG_OPTIONS_MBDIFF_1)$\n$\n\
! $(PFI_LANG_OPTIONS_MBDIFF_2)"
bad_exit:
***************
*** 1306,1312 ****
; Stay with the custom page created by "SetOptionsPage"
- Pop ${L_TXT}
Pop ${L_RESULT}
- Pop ${L_MSG}
Abort
--- 1262,1266 ----
***************
*** 1315,1325 ****
; Allow next page in the installation sequence to be shown
- Pop ${L_TXT}
Pop ${L_RESULT}
- Pop ${L_MSG}
- !undef L_MSG
!undef L_RESULT
- !undef L_TXT
FunctionEnd
--- 1269,1275 ----
***************
*** 1496,1504 ****
ReadRegStr ${L_OEDATA} HKCU ${L_ACCOUNT} "Account Name"
StrCpy ${L_OEDATA} $\"${L_OEDATA}$\"
! StrCpy ${LG_TEMP} "$(PFI_LANG_OECFG_IO_LINK_1)"
! StrCpy ${L_OEDATA} "${L_OEDATA} ${LG_TEMP} ${L_IDENTITY} "
! StrCpy ${LG_TEMP} "$(PFI_LANG_OECFG_IO_LINK_2)"
! StrCpy ${L_OEDATA} "${L_OEDATA}${LG_TEMP}"
! !insertmacro MUI_INSTALLOPTIONS_WRITE "ioB.ini" "Field 10" "Text" "${L_OEDATA}"
; Display the OE account data and offer to configure this account to work with POPFile
--- 1446,1451 ----
ReadRegStr ${L_OEDATA} HKCU ${L_ACCOUNT} "Account Name"
StrCpy ${L_OEDATA} $\"${L_OEDATA}$\"
! !insertmacro MUI_INSTALLOPTIONS_WRITE "ioB.ini" "Field 10" "Text" \
! "${L_OEDATA} $(PFI_LANG_OECFG_IO_LINK_1) ${L_IDENTITY} $(PFI_LANG_OECFG_IO_LINK_2)"
; Display the OE account data and offer to configure this account to work with POPFile
***************
*** 1590,1599 ****
Function StartPOPFilePage_Init
- !define L_MSG $R9
- !define L_TXT $R8
-
- Push ${L_MSG}
- Push ${L_TXT}
-
!insertmacro PFI_IO_TEXT "ioC.ini" "1" "$(PFI_LANG_LAUNCH_IO_INTRO)"
!insertmacro PFI_IO_TEXT "ioC.ini" "2" "$(PFI_LANG_LAUNCH_IO_NO)"
--- 1537,1540 ----
***************
*** 1601,1616 ****
!insertmacro PFI_IO_TEXT "ioC.ini" "4" "$(PFI_LANG_LAUNCH_IO_BCKGRND)"
! StrCpy ${L_MSG} "$(PFI_LANG_LAUNCH_IO_NOTE_1)"
! StrCpy ${L_TXT} "$(PFI_LANG_LAUNCH_IO_NOTE_2)"
! StrCpy ${L_MSG} "${L_MSG}\r\n\r\n${L_TXT}"
! StrCpy ${L_TXT} "$(PFI_LANG_LAUNCH_IO_NOTE_3)"
! StrCpy ${L_MSG} "${L_MSG}\r\n\r\n${L_TXT}"
! !insertmacro PFI_IO_TEXT "ioC.ini" "6" "${L_MSG}"
!
! Pop ${L_TXT}
! Pop ${L_MSG}
!
! !undef L_MSG
! !undef L_TXT
FunctionEnd
--- 1542,1549 ----
!insertmacro PFI_IO_TEXT "ioC.ini" "4" "$(PFI_LANG_LAUNCH_IO_BCKGRND)"
! !insertmacro PFI_IO_TEXT "ioC.ini" "6" \
! "$(PFI_LANG_LAUNCH_IO_NOTE_1)\r\n\r\n\
! $(PFI_LANG_LAUNCH_IO_NOTE_2)\r\n\r\n\
! $(PFI_LANG_LAUNCH_IO_NOTE_3)"
FunctionEnd
***************
*** 2089,2103 ****
!define L_CFG $R9
!define L_LNE $R8
! !define L_MSG $R7
! !define L_REG_KEY $R6
! !define L_REG_SUBKEY $R5
! !define L_REG_VALUE $R4
! !define L_TEMP $R3
IfFileExists $INSTDIR\popfile.pl skip_confirmation
! StrCpy ${L_MSG} "$(un.PFI_LANG_MBNOTFOUND_1)"
! StrCpy ${L_TEMP} "$(un.PFI_LANG_MBNOTFOUND_2)"
! StrCpy ${L_MSG} "${L_MSG} '$INSTDIR'.$\r$\n$\r$\n${L_TEMP}"
! MessageBox MB_YESNO|MB_ICONSTOP|MB_DEFBUTTON2 "${L_MSG}" IDYES skip_confirmation
Abort "$(un.PFI_LANG_ABORT_1)"
--- 2022,2034 ----
!define L_CFG $R9
!define L_LNE $R8
! !define L_REG_KEY $R7
! !define L_REG_SUBKEY $R6
! !define L_REG_VALUE $R5
! !define L_TEMP $R4
IfFileExists $INSTDIR\popfile.pl skip_confirmation
! MessageBox MB_YESNO|MB_ICONSTOP|MB_DEFBUTTON2 \
! "$(un.PFI_LANG_MBNOTFOUND_1) '$INSTDIR'.$\r$\n$\r$\n\
! $(un.PFI_LANG_MBNOTFOUND_2)" IDYES skip_confirmation
Abort "$(un.PFI_LANG_ABORT_1)"
***************
*** 2154,2159 ****
Pop ${G_GUI}
StrCmp ${G_GUI} "" skip_shutdown
! StrCpy ${L_MSG} "$(un.PFI_LANG_LOG_1)"
! DetailPrint "${L_MSG} ${G_GUI}"
NSISdl::download_quiet http://127.0.0.1:${G_GUI}/shutdown "$PLUGINSDIR\shutdown.htm"
Pop ${L_TEMP}
--- 2085,2089 ----
Pop ${G_GUI}
StrCmp ${G_GUI} "" skip_shutdown
! DetailPrint "$(un.PFI_LANG_LOG_1) ${G_GUI}"
NSISdl::download_quiet http://127.0.0.1:${G_GUI}/shutdown "$PLUGINSDIR\shutdown.htm"
Pop ${L_TEMP}
***************
*** 2201,2206 ****
FileOpen ${L_CFG} $INSTDIR\popfile.reg r
IfErrors skip_registry_restore
! StrCpy ${L_MSG} "$(un.PFI_LANG_LOG_2)"
! DetailPrint "${L_MSG}: popfile.reg"
restore_loop:
--- 2131,2135 ----
FileOpen ${L_CFG} $INSTDIR\popfile.reg r
IfErrors skip_registry_restore
! DetailPrint "$(un.PFI_LANG_LOG_2): popfile.reg"
restore_loop:
***************
*** 2221,2232 ****
IfErrors skip_registry_restore
WriteRegStr HKCU ${L_REG_KEY} ${L_REG_SUBKEY} ${L_REG_VALUE}
! StrCpy ${L_MSG} "$(un.PFI_LANG_LOG_3)"
! DetailPrint "${L_MSG} ${L_REG_SUBKEY}: ${L_REG_VALUE}"
goto restore_loop
skip_registry_restore:
FileClose ${L_CFG}
! StrCpy ${L_MSG} "$(un.PFI_LANG_LOG_4)"
! DetailPrint "${L_MSG}: popfile.reg"
Delete $INSTDIR\popfile.reg
--- 2150,2159 ----
IfErrors skip_registry_restore
WriteRegStr HKCU ${L_REG_KEY} ${L_REG_SUBKEY} ${L_REG_VALUE}
! DetailPrint "$(un.PFI_LANG_LOG_3) ${L_REG_SUBKEY}: ${L_REG_VALUE}"
goto restore_loop
skip_registry_restore:
FileClose ${L_CFG}
! DetailPrint "$(un.PFI_LANG_LOG_4): popfile.reg"
Delete $INSTDIR\popfile.reg
***************
*** 2320,2327 ****
IfFileExists $INSTDIR 0 Removed
DetailPrint "$(un.PFI_LANG_LOG_6)"
! StrCpy ${L_MSG} "$(un.PFI_LANG_MBREMERR_1)"
! StrCpy ${L_TEMP} "$(un.PFI_LANG_MBREMERR_2)"
! StrCpy ${L_MSG} "${L_MSG}: $INSTDIR ${L_TEMP}"
! MessageBox MB_OK|MB_ICONEXCLAMATION ${L_MSG}
Removed:
--- 2247,2252 ----
IfFileExists $INSTDIR 0 Removed
DetailPrint "$(un.PFI_LANG_LOG_6)"
! MessageBox MB_OK|MB_ICONEXCLAMATION \
! "$(un.PFI_LANG_MBREMERR_1): $INSTDIR $(un.PFI_LANG_MBREMERR_2)"
Removed:
***************
*** 2330,2334 ****
!undef L_CFG
!undef L_LNE
- !undef L_MSG
!undef L_REG_KEY
!undef L_REG_SUBKEY
--- 2255,2258 ----
|
