make the notepad replace more failprove

This commit is contained in:
Mario Fetka
2013-05-19 17:38:01 +02:00
parent 68275c2332
commit c34b50d393
2 changed files with 26 additions and 28 deletions

View File

@@ -33,7 +33,7 @@ if (($INST_SystemType$ = "x86 System") and ($INST_architecture$ = "system specif
sub_check_exitcode
endif
comment "Restore original Notepad"
Winbatch_restore_32
Dosbatch_restore_32
comment "Delete files"
Files_uninstall_32 /32Bit
@@ -64,7 +64,8 @@ if ($INST_SystemType$ = "64 Bit System") and (($INST_architecture$ = "system spe
sub_check_exitcode
endif
comment "Restore original Notepad"
Winbatch_restore_64
Dosbatch_restore_32
Dosbatch_restore_64
comment "Delete files"
Files_uninstall_64 /64Bit
@@ -84,9 +85,10 @@ ExitWindows /Reboot
[Winbatch_uninstall_32]
"$UninstallProgram32$" /S
[Winbatch_restore_32]
pendmove %Systemroot%\notepad.exe.orig %Systemroot%\notepad.exe
pendmove %Systemroot%\system32\notepad.exe.orig %Systemroot%\system32\notepad.exe
[Dosbatch_restore_32]
@echo off
If exist "%Systemroot%\notepad.exe.orig" (pendmove "%Systemroot%\notepad.exe.orig" "%Systemroot%\notepad.exe")
If exist "%Systemroot%\system32\notepad.exe.orig" (pendmove "%Systemroot%\system32\notepad.exe.orig" "%Systemroot%\system32\notepad.exe")
[Files_uninstall_32]
; Example for recursively deleting the installation directory (don't forget the trailing backslash):
@@ -99,10 +101,9 @@ delete -sf "$InstallDir32$\"
[Winbatch_uninstall_64]
"$UninstallProgram64$" /S
[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
[Dosbatch_restore_64]
@echo off
If exist "%Systemroot%\SysWOW64\notepad.exe.orig" (pendmove "%Systemroot%\SysWOW64\notepad.exe.orig" "%Systemroot%\SysWOW64\notepad.exe")
[Files_uninstall_64]
; Example for recursively deleting the installation directory: