From 710efd3194c05043ec27b8e0258387082f834b7b Mon Sep 17 00:00:00 2001 From: LoRd_MuldeR Date: Sun, 18 Mar 2018 14:13:54 +0100 Subject: [PATCH] Check installed version. Abort if installed version is newer than setup version. Ask whether to proceed if installed version is the same as setup version. --- Language/MPUI_DE.nsh | 2 ++ Language/MPUI_EN.nsh | 2 ++ MPUI_Setup.nsi | 20 ++++++++++++++++++++ 3 files changed, 24 insertions(+) diff --git a/Language/MPUI_DE.nsh b/Language/MPUI_DE.nsh index 81f9515..637116b 100644 --- a/Language/MPUI_DE.nsh +++ b/Language/MPUI_DE.nsh @@ -22,10 +22,12 @@ LangString MPLAYER_LANG_APPLYING_TWEAKS ${LANG_GERMAN} "Anpassungen werden gerade übernommen..." LangString MPLAYER_LANG_AUTO_UPDATE ${LANG_GERMAN} "Auto-Update" LangString MPLAYER_LANG_BIN_CODECS ${LANG_GERMAN} "Binäre Codecs" +LangString MPLAYER_LANG_CAN_NOT_UPDATE ${LANG_GERMAN} "Auf Ihrem System ist bereits eine Version von MPlayer für Windows installiert, die neuer als dieses Setup-Paket ist. Ein Update ist daher nicht möglich. Setup wird jetzt!" LangString MPLAYER_LANG_COMPRESS_FILES ${LANG_GERMAN} "Programmdateien optimieren" LangString MPLAYER_LANG_COMPRESSING ${LANG_GERMAN} "Optimiere:" LangString MPLAYER_LANG_CONFIG_MPUI ${LANG_GERMAN} "Fehler beim Schreiben der MPUI Konfigurationsdatei!" LangString MPLAYER_LANG_CONFIG_SMPLAYER ${LANG_GERMAN} "Fehler beim Schreiben der SMPlayer Konfigurationsdatei!" +LangString MPLAYER_LANG_CONFIRM_UPDATE ${LANG_GERMAN} "Auf Ihrem System ist bereits eine Version von MPlayer für Windows installiert, die der Version dieses Setup-Pakets entspricht. Möchten Sie dennoch fortfahren?" LangString MPLAYER_LANG_DETECTING ${LANG_GERMAN} "CPU-Typ wird ermittelt..." LangString MPLAYER_LANG_DL_ABORTED ${LANG_GERMAN} "Download wurde abgebrochen!" LangString MPLAYER_LANG_DL_COMPELETED ${LANG_GERMAN} "Download vollständig." diff --git a/Language/MPUI_EN.nsh b/Language/MPUI_EN.nsh index cb6ee91..4ee9f0a 100644 --- a/Language/MPUI_EN.nsh +++ b/Language/MPUI_EN.nsh @@ -22,10 +22,12 @@ LangString MPLAYER_LANG_APPLYING_TWEAKS ${LANG_ENGLISH} "Tweaks are being applied..." LangString MPLAYER_LANG_AUTO_UPDATE ${LANG_ENGLISH} "Auto-Update" LangString MPLAYER_LANG_BIN_CODECS ${LANG_ENGLISH} "Binary Codecs" +LangString MPLAYER_LANG_CAN_NOT_UPDATE ${LANG_ENGLISH} "The version of MPlayer for Windows currently installed on your computer is newer than the version contained in this installation package. Setup will exist now!" LangString MPLAYER_LANG_COMPRESS_FILES ${LANG_ENGLISH} "Optimize program files" LangString MPLAYER_LANG_COMPRESSING ${LANG_ENGLISH} "Optimizing" LangString MPLAYER_LANG_CONFIG_MPUI ${LANG_ENGLISH} "Faild to write MPUI configuration file!" LangString MPLAYER_LANG_CONFIG_SMPLAYER ${LANG_ENGLISH} "Faild to write SMPlayer configuration file!" +LangString MPLAYER_LANG_CONFIRM_UPDATE ${LANG_ENGLISH} "The version of MPlayer for Windows currently installed on your computer is the same as the version contained in this installation package. Do you want to proceed anyway?" LangString MPLAYER_LANG_DETECTING ${LANG_ENGLISH} "Detetcing CPU type..." LangString MPLAYER_LANG_DL_ABORTED ${LANG_ENGLISH} "Download was aborted!" LangString MPLAYER_LANG_DL_COMPELETED ${LANG_ENGLISH} "Download completed." diff --git a/MPUI_Setup.nsi b/MPUI_Setup.nsi index 6918087..2fc35ca 100644 --- a/MPUI_Setup.nsi +++ b/MPUI_Setup.nsi @@ -364,6 +364,16 @@ FunctionEnd ; INSTALL SECTIONS ;-------------------------------------------------------------------------------- +Section "-Check Current Version" + ${If} ${FileExists} "$INSTDIR\version.tag" + ReadINIStr $0 "$INSTDIR\version.tag" "mplayer_version" "build_no" + ${If} $0 > ${MPLAYER_BUILDNO} + MessageBox MB_OK|MB_ICONEXCLAMATION|MB_TOPMOST "$(MPLAYER_LANG_CAN_NOT_UPDATE)" + Quit + ${EndIf} + ${EndIf} +SectionEnd + Section "-Clean Up" ${PrintProgress} "$(MPLAYER_LANG_STATUS_INST_CLEAN)" @@ -1152,6 +1162,16 @@ Function CheckForUpdate ${EndIf} ${If} ${FileExists} "$INSTDIR\MPlayer.exe" + ${If} ${FileExists} "$INSTDIR\version.tag" + ReadINIStr $0 "$INSTDIR\version.tag" "mplayer_version" "build_no" + ${If} $0 > ${MPLAYER_BUILDNO} + MessageBox MB_OK|MB_ICONEXCLAMATION "$(MPLAYER_LANG_CAN_NOT_UPDATE)" + Quit + ${EndIf} + ${If} $0 = ${MPLAYER_BUILDNO} + ${IfCmd} MessageBox MB_YESNO|MB_ICONEXCLAMATION "$(MPLAYER_LANG_CONFIRM_UPDATE)" /SD IDYES IDNO ${||} Quit ${|} + ${EndIf} + ${EndIf} !insertmacro EnablePathEditable 0 1 Return ${EndIf} -- 2.11.4.GIT