Philipp Hörist pushed to branch master at gajim / gajim
Commits: 1f0a3158 by wurstsalat at 2021-05-14T21:37:09+02:00 PortableInstaller: Add directory cleanup - - - - - 20ebd79e by wurstsalat at 2021-05-14T21:37:09+02:00 Uninstaller: Kill gdbus.exe if running - - - - - 055308ec by wurstsalat at 2021-05-14T21:37:09+02:00 Installer: Add Gajim branding text - - - - - 2 changed files: - win/misc/gajim-portable.nsi - win/misc/gajim.nsi Changes: ===================================== win/misc/gajim-portable.nsi ===================================== @@ -2,6 +2,8 @@ Unicode true !include "MUI2.nsh" +!include "LogicLib.nsh" + Name "Gajim" OutFile "Gajim-Portable.exe" @@ -12,6 +14,7 @@ SetCompressorDictSize 32 InstallDir "$PROFILE\Gajim" RequestExecutionLevel user +BrandingText "Gajim Setup" !define MUI_ICON "${NSISDIR}\Contrib\Graphics\Icons\orange-install.ico" !define MUI_HEADERIMAGE @@ -51,6 +54,7 @@ LangString NAME_Languages ${LANG_ENGLISH} "Languages" LangString NAME_SecLanguagesOther ${LANG_ENGLISH} "Other" LangString NAME_Themes ${LANG_ENGLISH} "Themes" LangString DESC_SecGajim ${LANG_ENGLISH} "Installs the main Gajim files." +LangString INST_NotEmpty ${LANG_ENGLISH} "It looks like you already installed Gajim in this directory. A cleanup is necessary before installing. Your user data will not be touched. Cleanup now?" ; French @@ -60,6 +64,7 @@ LangString NAME_Languages ${LANG_FRENCH} "Langues" LangString NAME_SecLanguagesOther ${LANG_FRENCH} "Autre" LangString NAME_Themes ${LANG_FRENCH} "Thèmes" LangString DESC_SecGajim ${LANG_FRENCH} "Installer les fichiers principaux de Gajim." +LangString INST_NotEmpty ${LANG_FRENCH} "It looks like you already installed Gajim in this directory. A cleanup is necessary before installing. Your user data will not be touched. Cleanup now?" ; German @@ -69,6 +74,7 @@ LangString NAME_Languages ${LANG_GERMAN} "Sprachen" LangString NAME_SecLanguagesOther ${LANG_GERMAN} "Sonstige" LangString NAME_Themes ${LANG_GERMAN} "Designs" LangString DESC_SecGajim ${LANG_GERMAN} "Installiert die Hauptdateien von Gajim." +LangString INST_NotEmpty ${LANG_GERMAN} "Anscheinend ist Gajim bereits in diesem Verzeichnis installiert. Vor der Installation ist es notwendig das Verzeichnis aufzuräumen. Deine Benutzerdaten bleiben erhalten. Jetzt aufräumen?" ; Italian @@ -78,6 +84,7 @@ LangString NAME_Languages ${LANG_ITALIAN} "Lingue" LangString NAME_SecLanguagesOther ${LANG_ITALIAN} "Altre" LangString NAME_Themes ${LANG_ITALIAN} "Temi" LangString DESC_SecGajim ${LANG_ITALIAN} "Installa i file principali di Gajim." +LangString INST_NotEmpty ${LANG_ITALIAN} "It looks like you already installed Gajim in this directory. A cleanup is necessary before installing. Your user data will not be touched. Cleanup now?" ; Russian @@ -87,6 +94,7 @@ LangString NAME_Languages ${LANG_RUSSIAN} "Языки" LangString NAME_SecLanguagesOther ${LANG_RUSSIAN} "Другое" LangString NAME_Themes ${LANG_RUSSIAN} "Темы" LangString DESC_SecGajim ${LANG_RUSSIAN} "Установка основных файлов Gajim." +LangString INST_NotEmpty ${LANG_RUSSIAN} "It looks like you already installed Gajim in this directory. A cleanup is necessary before installing. Your user data will not be touched. Cleanup now?" ; Hebrew @@ -96,11 +104,24 @@ LangString NAME_Languages ${LANG_HEBREW} "שפות" LangString NAME_SecLanguagesOther ${LANG_HEBREW} "אחרות" LangString NAME_Themes ${LANG_HEBREW} "ערכאות נושא" LangString DESC_SecGajim ${LANG_HEBREW} "מתקין קבצי Gajim עיקריים." +LangString INST_NotEmpty ${LANG_HEBREW} "It looks like you already installed Gajim in this directory. A cleanup is necessary before installing. Your user data will not be touched. Cleanup now?" Section "Gajim" SecGajim SectionIn RO SetOutPath "$INSTDIR" + + ${If} ${FileExists} "$InstDir\bin\Gajim.exe" + MessageBox MB_YESNO $(INST_NotEmpty) IDYES cleanup + Abort + cleanup: + RMDir /r "$InstDir\bin" + RMDir /r "$InstDir\etc" + RMDir /r "$InstDir\lib" + RMDir /r "$InstDir\share" + RMDir /r "$InstDir\ssl" + ${EndIf} + File /r "${ARCH}\*.*" SetOutPath "$INSTDIR\bin" ===================================== win/misc/gajim.nsi ===================================== @@ -2,6 +2,7 @@ Unicode true !include "MUI2.nsh" +!include "LogicLib.nsh" Name "Gajim" OutFile "Gajim.exe" @@ -13,6 +14,7 @@ SetCompressorDictSize 32 InstallDir "$PROGRAMFILES\Gajim" InstallDirRegKey HKCU "Software\Gajim" "" RequestExecutionLevel admin +BrandingText "Gajim Setup" Var StartMenuFolder @@ -210,6 +212,9 @@ Section $(NAME_SecURI) SecURI SectionEnd Section "Uninstall" + + ExecWait "TaskKill /IM gdbus.exe /F" + RMDir /r "$INSTDIR" !insertmacro MUI_STARTMENU_GETFOLDER Application $StartMenuFolder View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/ae5ec7938f3d917855d1485ddc967d0055fcc4ae...055308ecb6654e7ff5565cafa1078017619253fb -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/ae5ec7938f3d917855d1485ddc967d0055fcc4ae...055308ecb6654e7ff5565cafa1078017619253fb You're receiving this email because of your account on dev.gajim.org.
_______________________________________________ Commits mailing list Commits@gajim.org https://lists.gajim.org/cgi-bin/listinfo/commits