diff --git a/CLIENT_DATA/setup3264.ins b/CLIENT_DATA/setup3264.ins index 52a88af..cc193c4 100644 --- a/CLIENT_DATA/setup3264.ins +++ b/CLIENT_DATA/setup3264.ins @@ -120,8 +120,8 @@ endif 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 -v "%ScriptPath%\X86\i686\wait_for_exit\notepad.exe" "%Systemroot%\notepad.exe.pp32" -vcopy -v "%ScriptPath%\X86\i686\wait_for_exit\notepad.exe" "%Systemroot%\system32\notepad.exe.pp32" +vcopy -v "%ScriptPath%\X86\npplauncher.exe" "%Systemroot%\notepad.exe.pp32" +vcopy -v "%ScriptPath%\X86\npplauncher.exe" "%Systemroot%\system32\notepad.exe.pp32" pendmove "%Systemroot%\notepad.exe.pp32" "%Systemroot%\notepad.exe" pendmove "%Systemroot%\system32\notepad.exe.pp32" "%Systemroot%\system32\notepad.exe" @@ -142,9 +142,9 @@ copy "$IniCfgFile$" "$InstallDir32$" @echo off If NOT exist "%Systemroot%\SysWOW64\notepad.exe.orig" (pendmove "%Systemroot%\SysWOW64\notepad.exe" "%Systemroot%\SysWOW64\notepad.exe.orig") -vcopy -v "%ScriptPath%\X86\x86_64\wait_for_exit\notepad.exe" "%Systemroot%\notepad.exe.pp64" -vcopy -v "%ScriptPath%\X86\x86_64\wait_for_exit\notepad.exe" "%Systemroot%\system32\notepad.exe.pp64" -vcopy -v "%ScriptPath%\X86\x86_64\wait_for_exit\notepad.exe" "%Systemroot%\SysWOW64\notepad.exe.pp64" +vcopy -v "%ScriptPath%\X86\npplauncher.exe" "%Systemroot%\notepad.exe.pp64" +vcopy -v "%ScriptPath%\X86\npplauncher.exe" "%Systemroot%\system32\notepad.exe.pp64" +vcopy -v "%ScriptPath%\X86\npplauncher.exe" "%Systemroot%\SysWOW64\notepad.exe.pp64" pendmove "%Systemroot%\SysWOW64\notepad.exe.pp64" %Systemroot%\SysWOW64\notepad.exe" diff --git a/builder-product.cfg b/builder-product.cfg index 125a398..233c32a 100644 --- a/builder-product.cfg +++ b/builder-product.cfg @@ -5,7 +5,7 @@ VENDOR="notepad-plus-plus.org" PN="notepadpp.notepadpp" NAME="Notepad++" DESCRIPTION="Notepad++ is a free source code editor and Notepad replacement that supports several languages." -VERSION="7.4.2" +VERSION="7.5" RELEASE="4" PRIORITY="0" ADVICE="" @@ -26,10 +26,9 @@ DL_SOURCE[2]="https://notepad-plus-plus.org/repository/7.x/${VERSION}/npp.${VERS DL_ARCH[2]="X86_64" DL_WINST_NAME[2]="Install64Exe" -DL_FILE[3]="npplauncher-${VERSION}.zip" -DL_SOURCE[3]="https://github.com/downloads/przemoc/npplauncher/npplauncher.zip" +DL_FILE[3]="npplauncher.exe" +DL_SOURCE[3]="https://github.com/przemoc/npplauncher/releases/download/v0.6/notepad.exe" DL_ARCH[3]="X86" -DL_EXTRACT_FORMAT[3]="unzip" OPSI_INI_SECTION[0]="X86" OPSI_INI_OPTION[0]="UninstallProg32" diff --git a/npp.7.4.2.Installer.exe.sha1sum b/npp.7.4.2.Installer.exe.sha1sum deleted file mode 100644 index dc81182..0000000 --- a/npp.7.4.2.Installer.exe.sha1sum +++ /dev/null @@ -1 +0,0 @@ -54f638fa6bdecedaf62770abb015fde6c2e0d6bc /home/mario/.opsi-dist-cache/notepadpp.notepadpp-7.4.2/X86/npp.7.4.2.Installer.exe diff --git a/npp.7.4.2.Installer.x64.exe.sha1sum b/npp.7.4.2.Installer.x64.exe.sha1sum deleted file mode 100644 index ea50023..0000000 --- a/npp.7.4.2.Installer.x64.exe.sha1sum +++ /dev/null @@ -1 +0,0 @@ -bd2a6ef69c97a1e6d236f8c2021520cb32899945 /home/mario/.opsi-dist-cache/notepadpp.notepadpp-7.4.2/X86_64/npp.7.4.2.Installer.x64.exe diff --git a/npp.7.5.Installer.exe.sha1sum b/npp.7.5.Installer.exe.sha1sum new file mode 100644 index 0000000..03509a0 --- /dev/null +++ b/npp.7.5.Installer.exe.sha1sum @@ -0,0 +1 @@ +abd933d283ade15949f553a1350fe126951be70a /home/mario/.opsi-dist-cache/notepadpp.notepadpp-7.5/X86/npp.7.5.Installer.exe diff --git a/npp.7.5.Installer.x64.exe.sha1sum b/npp.7.5.Installer.x64.exe.sha1sum new file mode 100644 index 0000000..a8d5d51 --- /dev/null +++ b/npp.7.5.Installer.x64.exe.sha1sum @@ -0,0 +1 @@ +d465070957be11d01c3b255c417ccc1545229c60 /home/mario/.opsi-dist-cache/notepadpp.notepadpp-7.5/X86_64/npp.7.5.Installer.x64.exe diff --git a/npplauncher-7.4.2.zip.sha1sum b/npplauncher-7.4.2.zip.sha1sum deleted file mode 100644 index 9db2800..0000000 --- a/npplauncher-7.4.2.zip.sha1sum +++ /dev/null @@ -1 +0,0 @@ -562aca0927e41b161b8c1f5abef0d2b94852e31c /home/mario/.opsi-dist-cache/notepadpp.notepadpp-7.4.2/X86/npplauncher-7.4.2.zip diff --git a/npplauncher.exe.sha1sum b/npplauncher.exe.sha1sum new file mode 100644 index 0000000..200f641 --- /dev/null +++ b/npplauncher.exe.sha1sum @@ -0,0 +1 @@ +d259f8c6bff72fd4147b066a07e9a057bf1626ba /home/mario/.opsi-dist-cache/notepadpp.notepadpp-7.5/X86/npplauncher.exe