diff --git a/smartmontools/ChangeLog b/smartmontools/ChangeLog index 6cc687767b2fdbcdadd58583fa9b42e1e3e652b3..e356273afda2d72cac12b448ac2d235495bada7d 100644 --- a/smartmontools/ChangeLog +++ b/smartmontools/ChangeLog @@ -2,6 +2,9 @@ $Id$ 2022-02-01 Christian Franke <franke@computer.org> + os_win32/installer.nsi: Install update-smart-drivedb.ps1. + Delete update-smart-drivedb.exe. Remove outdated delete commands. + os_win32/update-smart-drivedb.ps1.in: New drivedb.h update script. It verifies the downloaded drive database with GnuPG (#752). Makefile.am: Add new file. diff --git a/smartmontools/os_win32/installer.nsi b/smartmontools/os_win32/installer.nsi index 01c7c4278078478c95017ef079cb68d3db93508d..76273d7ca287cbcfeda3eaee963bbd6de5c7cc58 100644 --- a/smartmontools/os_win32/installer.nsi +++ b/smartmontools/os_win32/installer.nsi @@ -3,7 +3,7 @@ ; ; Home page of code is: https://www.smartmontools.org ; -; Copyright (C) 2006-19 Christian Franke +; Copyright (C) 2006-22 Christian Franke ; ; SPDX-License-Identifier: GPL-2.0-or-later ; @@ -188,7 +188,8 @@ SectionGroup "!Program files" SetOutPath "$INSTDIR\bin" File "${INPDIR}\bin\drivedb.h" - File "${INPDIR}\bin\update-smart-drivedb.exe" + Delete "$INSTDIR\bin\update-smart-drivedb.exe" ; TODO: Remove after smartmontools 7.3 + File "${INPDIR}\bin\update-smart-drivedb.ps1" SectionEnd @@ -201,7 +202,6 @@ Section "!Documentation" DOC_SECTION SetOutPath "$INSTDIR\doc" File "${INPDIR}\doc\AUTHORS.txt" File "${INPDIR}\doc\ChangeLog.txt" - Delete "$INSTDIR\doc\ChangeLog-5.0-6.0.txt" ; TODO: Remove after smartmontools 7.1 File "${INPDIR}\doc\ChangeLog-6.0-7.0.txt" File "${INPDIR}\doc\COPYING.txt" File "${INPDIR}\doc\INSTALL.txt" @@ -234,10 +234,6 @@ Section "Uninstaller" UNINST_SECTION CreateDirectory "$INSTDIR" - ; Remove old "Install_Dir" registry entry (smartmontools < r3911/6.3) - ; No longer needed for GSmartControl - DeleteRegKey HKLM "Software\smartmontools" ; TODO: Remove after smartmontools 7.0 - ; Write uninstall keys and program WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\smartmontools" "DisplayName" "smartmontools" !ifdef VERSTR @@ -349,9 +345,13 @@ Section "Start Menu Shortcuts" MENU_SECTION CreateShortCut "$SMPROGRAMS\smartmontools\smartmontools Daily Builds.lnk" "https://builds.smartmontools.org/" ; drivedb.h update - ${If} ${FileExists} "$INSTDIR\bin\update-smart-drivedb.exe" + Delete "$SMPROGRAMS\smartmontools\drivedb.h update.lnk" ; TODO: Remove after smartmontools 7.3 + ${If} ${FileExists} "$INSTDIR\bin\update-smart-drivedb.ps1" SetOutPath "$INSTDIR\bin" - !insertmacro CreateAdminShortCut "$SMPROGRAMS\smartmontools\drivedb.h update.lnk" "$INSTDIR\bin\update-smart-drivedb.exe" "" + !insertmacro CreateAdminShortCut "$SMPROGRAMS\smartmontools\drivedb.h update (ps1).lnk" "$INSTDIR\bin\runcmdu.exe" "powershell -NoProfile -ExecutionPolicy Bypass .\update-smart-drivedb.ps1" + ${If} ${FileExists} "$INSTDIR\doc\README.TXT" + CreateShortCut "$SMPROGRAMS\smartmontools\Documentation\drivedb.h update help (ps1).lnk" "$INSTDIR\bin\runcmdu.exe" 'powershell -NoProfile -ExecutionPolicy Bypass "Get-Help .\update-smart-drivedb.ps1 -Detail | more"' + ${EndIf} ${EndIf} ; Uninstall @@ -463,13 +463,13 @@ Section "Uninstall" Delete "$INSTDIR\bin\drivedb.h.error" Delete "$INSTDIR\bin\drivedb.h.lastcheck" Delete "$INSTDIR\bin\drivedb.h.old" - Delete "$INSTDIR\bin\update-smart-drivedb.exe" + Delete "$INSTDIR\bin\update-smart-drivedb.exe" ; TODO: Remove after smartmontools 7.3 + Delete "$INSTDIR\bin\update-smart-drivedb.ps1" Delete "$INSTDIR\bin\runcmda.exe" Delete "$INSTDIR\bin\runcmdu.exe" Delete "$INSTDIR\bin\wtssendmsg.exe" Delete "$INSTDIR\doc\AUTHORS.txt" Delete "$INSTDIR\doc\ChangeLog.txt" - Delete "$INSTDIR\doc\ChangeLog-5.0-6.0.txt" ; TODO: Remove after smartmontools 7.1 Delete "$INSTDIR\doc\ChangeLog-6.0-7.0.txt" Delete "$INSTDIR\doc\COPYING.txt" Delete "$INSTDIR\doc\INSTALL.txt"