From 386da3275746df9de6588abb97bd11dc969070b4 Mon Sep 17 00:00:00 2001 From: Mario Fetka Date: Thu, 21 Mar 2013 05:02:52 +0100 Subject: [PATCH] correct name of winbatch section --- CLIENT_DATA/delsub3264.ins | 10 ++++++---- CLIENT_DATA/setup3264.ins | 10 ++++++---- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/CLIENT_DATA/delsub3264.ins b/CLIENT_DATA/delsub3264.ins index 08df801..bd119f6 100644 --- a/CLIENT_DATA/delsub3264.ins +++ b/CLIENT_DATA/delsub3264.ins @@ -32,7 +32,8 @@ if (($INST_SystemType$ = "x86 System") and ($INST_architecture$ = "system specif Winbatch_uninstall_32 sub_check_exitcode endif - Winbatch_uninstall_32 + comment "Restore original Notepad" + Winbatch_restore_32 comment "Delete files" Files_uninstall_32 /32Bit @@ -62,7 +63,8 @@ if ($INST_SystemType$ = "64 Bit System") and (($INST_architecture$ = "system spe Winbatch_uninstall_64 sub_check_exitcode endif - Winbatch_uninstall_64 + comment "Restore original Notepad" + Winbatch_restore_64 comment "Delete files" Files_uninstall_64 /64Bit @@ -82,7 +84,7 @@ ExitWindows /Reboot [Winbatch_uninstall_32] "$UninstallProgram32$" /S -[Winbatch_uninstall_32] +[Winbatch_restore_32] pendmove %Systemroot%\notepad.exe.orig %Systemroot%\notepad.exe pendmove %Systemroot%\system32\notepad.exe.orig %Systemroot%\system32\notepad.exe @@ -97,7 +99,7 @@ delete -sf "$InstallDir32$\" [Winbatch_uninstall_64] "$UninstallProgram64$" /S -[Winbatch_uninstall_64] +[Winbatch_restore_64] pendmove %Systemroot%\notepad.exe.orig %Systemroot%\notepad.exe pendmove %Systemroot%\system32\notepad.exe.orig %Systemroot%\system32\notepad.exe pendmove %Systemroot%\SysWOW64\notepad.exe.orig %Systemroot%\SysWOW64\notepad.exe diff --git a/CLIENT_DATA/setup3264.ins b/CLIENT_DATA/setup3264.ins index 2f23323..182821b 100644 --- a/CLIENT_DATA/setup3264.ins +++ b/CLIENT_DATA/setup3264.ins @@ -75,7 +75,8 @@ else ChangeDirectory "%SCRIPTPATH%" Winbatch_install_32 Sub_check_exitcode - Winbatch_install_32 + comment "Replace Notepad with npp" + Winbatch_replace_32 comment "Copy files" Files_install_32 /32Bit comment "Patch Registry" @@ -90,7 +91,8 @@ else ChangeDirectory "%SCRIPTPATH%" Winbatch_install_64 Sub_check_exitcode - Winbatch_install_64 + comment "Replace Notepad with npp" + Winbatch_replace_64 comment "Copy files" Files_install_64 /64Bit comment "Patch Registry" @@ -105,7 +107,7 @@ endif [Winbatch_install_32] "$InstallExe$" /S -[Winbatch_install_32] +[Winbatch_replace_32] pendmove %Systemroot%\notepad.exe %Systemroot%\notepad.exe.orig pendmove %Systemroot%\system32\notepad.exe %Systemroot%\system32\notepad.exe.orig @@ -127,7 +129,7 @@ copy "$IniCfgFile$" "$InstallDir32$" [Winbatch_install_64] "$InstallExe$" /S -[Winbatch_install_64] +[Winbatch_replace_64] pendmove %Systemroot%\notepad.exe %Systemroot%\notepad.exe.orig pendmove %Systemroot%\system32\notepad.exe %Systemroot%\system32\notepad.exe.orig pendmove %Systemroot%\SysWOW64\notepad.exe %Systemroot%\SysWOW64\notepad.exe.orig