go-opsi/notepadpp.notepadpp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

make the notepad replace more failprove

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

35
CLIENT_DATA/setup3264.ins
View File

@@ -76,7 +76,7 @@ else
Winbatch_install_32
Sub_check_exitcode
comment "Replace Notepad with npp"
Winbatch_replace_32
Dosbatch_replace_32
comment "Copy files"
Files_install_32 /32Bit
comment "Patch Registry"
@@ -92,7 +92,8 @@ else
Winbatch_install_64
Sub_check_exitcode
comment "Replace Notepad with npp"
Winbatch_replace_64
Dosbatch_replace_32
Dosbatch_replace_64
comment "Copy files"
Files_install_64 /64Bit
comment "Patch Registry"
@@ -107,15 +108,16 @@ endif
[Winbatch_install_32]
"$InstallExe$" /S
[Winbatch_replace_32]
pendmove %Systemroot%\notepad.exe %Systemroot%\notepad.exe.orig
pendmove %Systemroot%\system32\notepad.exe %Systemroot%\system32\notepad.exe.orig
[Dosbatch_replace_32]
@echo off
If NOT exist "%Systemroot%\notepad.exe.orig" (pendmove "%Systemroot%\notepad.exe" "%Systemroot%\notepad.exe.orig")
If NOT exist "%Systemroot%\system32\notepad.exe.orig" (pendmove "%Systemroot%\system32\notepad.exe" "%Systemroot%\system32\notepad.exe.orig")
vcopy %ScriptPath%\X86\i686\wait_for_exit\notepad.exe %Systemroot%\notepad.exe.pp
vcopy %ScriptPath%\X86\i686\wait_for_exit\notepad.exe %Systemroot%\system32\notepad.exe.pp
vcopy "%ScriptPath%\X86\i686\wait_for_exit\notepad.exe" "%Systemroot%\notepad.exe.pp"
vcopy "%ScriptPath%\X86\i686\wait_for_exit\notepad.exe" "%Systemroot%\system32\notepad.exe.pp"
pendmove %Systemroot%\notepad.exe.pp %Systemroot%\notepad.exe
pendmove %Systemroot%\system32\notepad.exe.pp %Systemroot%\system32\notepad.exe
pendmove "%Systemroot%\notepad.exe.pp" "%Systemroot%\notepad.exe"
pendmove "%Systemroot%\system32\notepad.exe.pp" "%Systemroot%\system32\notepad.exe"
[Files_install_32]
@@ -129,18 +131,13 @@ copy "$IniCfgFile$" "$InstallDir32$"
[Winbatch_install_64]
"$InstallExe$" /S
[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
[Dosbatch_replace_64]
@echo off
If NOT exist "%Systemroot%\SysWOW64\notepad.exe.orig" (pendmove "%Systemroot%\SysWOW64\notepad.exe" "%Systemroot%\SysWOW64\notepad.exe.orig")
vcopy %ScriptPath%\X86\x86_64\wait_for_exit\notepad.exe %Systemroot%\notepad.exe.pp
vcopy %ScriptPath%\X86\x86_64\wait_for_exit\notepad.exe %Systemroot%\system32\notepad.exe.pp
vcopy %ScriptPath%\X86\x86_64\wait_for_exit\notepad.exe %Systemroot%\SysWOW64\notepad.exe.pp
vcopy "%ScriptPath%\X86\x86_64\wait_for_exit\notepad.exe" "%Systemroot%\SysWOW64\notepad.exe.pp"
pendmove %Systemroot%\notepad.exe.pp %Systemroot%\notepad.exe
pendmove %Systemroot%\system32\notepad.exe.pp %Systemroot%\system32\notepad.exe
pendmove %%Systemroot%\SysWOW64\notepad.exe.pp %Systemroot%\SysWOW64\notepad.exe
pendmove "%Systemroot%\SysWOW64\notepad.exe.pp" %Systemroot%\SysWOW64\notepad.exe"
[Files_install_64]