[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[vidalia-svn] r1848: Give users the option of not removing %appdata%\tor and %app (trunk/pkg/win32)
Author: edmanm
Date: 2007-08-21 03:48:22 -0400 (Tue, 21 Aug 2007)
New Revision: 1848
Modified:
trunk/pkg/win32/vidalia-bundle.nsi
trunk/pkg/win32/vidalia.nsi
trunk/pkg/win32/vidalia_cs.nsh
trunk/pkg/win32/vidalia_de.nsh
trunk/pkg/win32/vidalia_en.nsh
trunk/pkg/win32/vidalia_es.nsh
trunk/pkg/win32/vidalia_fa.nsh
trunk/pkg/win32/vidalia_fi.nsh
trunk/pkg/win32/vidalia_fr.nsh
trunk/pkg/win32/vidalia_it.nsh
trunk/pkg/win32/vidalia_nl.nsh
trunk/pkg/win32/vidalia_pl.nsh
trunk/pkg/win32/vidalia_pt-br.nsh
trunk/pkg/win32/vidalia_ru.nsh
trunk/pkg/win32/vidalia_sv.nsh
trunk/pkg/win32/vidalia_zh-cn.nsh
trunk/pkg/win32/vidalia_zh-tw.nsh
Log:
Give users the option of not removing %appdata%\tor and %appdata%\vidalia on
uninstall.
Modified: trunk/pkg/win32/vidalia-bundle.nsi
===================================================================
--- trunk/pkg/win32/vidalia-bundle.nsi 2007-08-21 05:38:31 UTC (rev 1847)
+++ trunk/pkg/win32/vidalia-bundle.nsi 2007-08-21 07:48:22 UTC (rev 1848)
@@ -462,29 +462,39 @@
; Uninstaller
Section "-Uninstall" Uninstall
SectionEnd
-
-Section "un.Tor ${TOR_APPVERSION}" UninstallTor
- SetShellVarContext current
- RMDir /r "$APPDATA\Tor"
- SetShellVarContext all
- RMDir /r "$INSTDIR\Tor"
- RMDir /r "$APPDATA\Tor"
- RMDir /r "${SHORTCUTS}\Tor"
- DeleteRegKey HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Tor"
-SectionEnd
-Section "un.Vidalia ${VIDALIA_APPVERSION}" UninstallVidalia
- SetShellVarContext current
- RMDir /r "$APPDATA\Vidalia"
- SetShellVarContext all
- RMDir /r "$INSTDIR\Vidalia"
- RMDir /r "$APPDATA\Vidalia"
- Delete "${SHORTCUTS}\Vidalia.lnk"
- Delete "${SHORTCUTS}\Vidalia Website.lnk"
- DeleteRegKey HKCU "Software\Microsoft\Windows\CurrentVersion\Run\Vidalia"
- DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Vidalia"
-SectionEnd
+SectionGroup "un.Tor ${TOR_APPVERSION}" UninstallTorGroup
+ Section "un.Tor" UninstallTor
+ SetShellVarContext all
+ RMDir /r "$INSTDIR\Tor"
+ RMDir /r "$APPDATA\Tor"
+ RMDir /r "${SHORTCUTS}\Tor"
+ DeleteRegKey HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Tor"
+ SectionEnd
+ Section "un.$(AppData)" UninstallTorAppData
+ SetShellVarContext current
+ RMDir /r "$APPDATA\Tor"
+ SectionEnd
+SectionGroupEnd
+
+SectionGroup "un.Vidalia ${VIDALIA_APPVERSION}" UninstallVidaliaGroup
+ Section "un.Vidalia" UninstallVidalia
+ SetShellVarContext all
+ RMDir /r "$INSTDIR\Vidalia"
+ RMDir /r "$APPDATA\Vidalia"
+ Delete "${SHORTCUTS}\Vidalia.lnk"
+ Delete "${SHORTCUTS}\Vidalia Website.lnk"
+ DeleteRegKey HKCU "Software\Microsoft\Windows\CurrentVersion\Run\Vidalia"
+ DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Vidalia"
+ SectionEnd
+
+ Section "un.$(AppData)" UninstallVidaliaAppData
+ SetShellVarContext current
+ RMDir /r "$APPDATA\Vidalia"
+ SectionEnd
+SectionGroupEnd
+
Section "un.Privoxy ${PRIVOXY_APPVERSION}" UninstallPrivoxy
SetShellVarContext all
RMDir /r "$INSTDIR\Privoxy"
@@ -505,18 +515,31 @@
Function un.onInit
!insertmacro MUI_LANGDLL_DISPLAY
+ SetShellVarContext current
- IfFileExists "$INSTDIR\Tor\*.*" CheckVidalia
+ IfFileExists "$INSTDIR\Tor\*.*" CheckTorAppData
SectionGetFlags ${UninstallTor} $0
IntOp $0 $0 & ${SECTION_OFF}
SectionSetFlags ${UninstallTor} $0
+
+ CheckTorAppData:
+ IfFileExists "$APPDATA\Tor\*.*" CheckVidalia
+ SectionGetFlags ${UninstallTorAppData} $0
+ IntOp $0 $0 & ${SECTION_OFF}
+ SectionSetFlags ${UninstallTorAppData} $0
CheckVidalia:
- IfFileExists "$INSTDIR\Vidalia\*.*" CheckPrivoxy
+ IfFileExists "$INSTDIR\Vidalia\*.*" CheckVidaliaAppData
SectionGetFlags ${UninstallVidalia} $0
IntOp $0 $0 & ${SECTION_OFF}
SectionSetFlags ${UninstallVidalia} $0
+ CheckVidaliaAppData:
+ IfFileExists "$APPDATA\Vidalia\*.*" CheckPrivoxy
+ SectionGetFlags ${UninstallVidaliaAppData} $0
+ IntOp $0 $0 & ${SECTION_OFF}
+ SectionSetFlags ${UninstallVidaliaAppData} $0
+
CheckPrivoxy:
IfFileExists "$INSTDIR\Privoxy\*.*" Done
SectionGetFlags ${UninstallPrivoxy} $0
@@ -560,7 +583,9 @@
!insertmacro MUI_UNFUNCTION_DESCRIPTION_BEGIN
!insertmacro MUI_DESCRIPTION_TEXT ${UninstallTor} "$(TorUninstDesc)"
+ !insertmacro MUI_DESCRIPTION_TEXT ${UninstallTorAppData} "$(AppDataUninstDesc)"
!insertmacro MUI_DESCRIPTION_TEXT ${UninstallVidalia} "$(VidaliaUninstDesc)"
+ !insertmacro MUI_DESCRIPTION_TEXT ${UninstallVidaliaAppData} "$(AppDataUninstDesc)"
!insertmacro MUI_DESCRIPTION_TEXT ${UninstallPrivoxy} "$(PrivoxyUninstDesc)"
!insertmacro MUI_UNFUNCTION_DESCRIPTION_END
Modified: trunk/pkg/win32/vidalia.nsi
===================================================================
--- trunk/pkg/win32/vidalia.nsi 2007-08-21 05:38:31 UTC (rev 1847)
+++ trunk/pkg/win32/vidalia.nsi 2007-08-21 07:48:22 UTC (rev 1848)
@@ -75,6 +75,7 @@
!insertmacro MUI_PAGE_INSTFILES
!insertmacro MUI_PAGE_FINISH
!insertmacro MUI_UNPAGE_WELCOME
+!insertmacro MUI_UNPAGE_COMPONENTS
!insertmacro MUI_UNPAGE_CONFIRM
!insertmacro MUI_UNPAGE_INSTFILES
!insertmacro MUI_UNPAGE_FINISH
@@ -165,9 +166,12 @@
;--------------------------------
; Uninstaller
-Section "Uninstall"
+Section "-Uninstall" Uninstall
+SectionEnd
+
+Section "un.${VIDALIA_NAME} ${VIDALIA_APPVERSION}" UninstallVidalia
SetShellVarContext all
-
+
; Remove registry keys
DeleteRegValue HKCU "Software\Microsoft\Windows\CurrentVersion\Run\" "${VIDALIA_NAME}"
DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${VIDALIA_NAME}"
@@ -175,14 +179,16 @@
; Remove files and uninstaller
Delete $INSTDIR\uninstall.exe
-
+
; Remove shortcuts, if any
Delete "$SMPROGRAMS\${VIDALIA_NAME}\*.*"
-
+
; Remove directories used
RMDir "$SMPROGRAMS\${VIDALIA_NAME}"
RMDir /r "$INSTDIR"
-
+SectionEnd
+
+Section "un.$(AppData)" UninstallVidaliaAppData
SetShellVarContext current
RMDir /r "$APPDATA\Vidalia"
SectionEnd
@@ -199,3 +205,8 @@
!insertmacro MUI_DESCRIPTION_TEXT ${RunAtStartup} "$(VidaliaStartupDesc)"
!insertmacro MUI_FUNCTION_DESCRIPTION_END
+!insertmacro MUI_UNFUNCTION_DESCRIPTION_BEGIN
+ !insertmacro MUI_DESCRIPTION_TEXT ${UninstallVidalia} $(VidaliaUninstDesc)
+ !insertmacro MUI_DESCRIPTION_TEXT ${UninstallVidaliaAppData} $(AppDataUninstDesc)
+!insertmacro MUI_UNFUNCTION_DESCRIPTION_END
+
Modified: trunk/pkg/win32/vidalia_cs.nsh
===================================================================
--- trunk/pkg/win32/vidalia_cs.nsh 2007-08-21 05:38:31 UTC (rev 1847)
+++ trunk/pkg/win32/vidalia_cs.nsh 2007-08-21 07:48:22 UTC (rev 1848)
@@ -53,4 +53,8 @@
LangString TorbuttonAppDesc ${LANG_CZECH} "Instalovat ${TORBUTTON_DESC}."
LangString TorbuttonAddToFirefox ${LANG_CZECH} "Vlozit do Firefox"
LangString TorbuttonAddToFirefoxDesc ${LANG_CZECH} "Vlozit ${TORBUTTON_DESC} rozsireni Firefox."
-LangString TorbuttonFirefoxNotFound ${LANG_CZECH} "Firefox nebyl ve vasem systemu nalezen. Torbutton nebude instalovan."
\ No newline at end of file
+LangString TorbuttonFirefoxNotFound ${LANG_CZECH} "Firefox nebyl ve vasem systemu nalezen. Torbutton nebude instalovan."
+
+; Miscellaneous Strings
+LangString AppData ${LANG_CZECH} "Application Data"
+LangString AppDataUninstDesc ${LANG_CZECH} "Remove saved application data and configuration files."
Modified: trunk/pkg/win32/vidalia_de.nsh
===================================================================
--- trunk/pkg/win32/vidalia_de.nsh 2007-08-21 05:38:31 UTC (rev 1847)
+++ trunk/pkg/win32/vidalia_de.nsh 2007-08-21 07:48:22 UTC (rev 1848)
@@ -57,3 +57,6 @@
LangString TorbuttonAddToFirefoxDesc ${LANG_GERMAN} "Die ${TORBUTTON_DESC}-Erweiterung zu Firefox hinzuf�
LangString TorbuttonFirefoxNotFound ${LANG_GERMAN} "Firefox konnte nicht gefunden werden. Torbutton wird nicht installiert."
+; Miscellaneous Strings
+LangString AppData ${LANG_GERMAN} "Application Data"
+LangString AppDataUninstDesc ${LANG_GERMAN} "Remove saved application data and configuration files."
Modified: trunk/pkg/win32/vidalia_en.nsh
===================================================================
--- trunk/pkg/win32/vidalia_en.nsh 2007-08-21 05:38:31 UTC (rev 1847)
+++ trunk/pkg/win32/vidalia_en.nsh 2007-08-21 07:48:22 UTC (rev 1848)
@@ -75,3 +75,7 @@
LangString TorbuttonAddToFirefoxDesc ${LANG_ENGLISH} "Add the ${TORBUTTON_DESC} extension to Firefox."
LangString TorbuttonFirefoxNotFound ${LANG_ENGLISH} "Firefox was not found on your system. Not installing Torbutton."
+; Miscellaneous Strings
+LangString AppData ${LANG_ENGLISH} "Application Data"
+LangString AppDataUninstDesc ${LANG_ENGLISH} "Remove saved application data and configuration files."
+
Modified: trunk/pkg/win32/vidalia_es.nsh
===================================================================
--- trunk/pkg/win32/vidalia_es.nsh 2007-08-21 05:38:31 UTC (rev 1847)
+++ trunk/pkg/win32/vidalia_es.nsh 2007-08-21 07:48:22 UTC (rev 1848)
@@ -55,3 +55,6 @@
LangString TorbuttonAddToFirefoxDesc ${LANG_SPANISH} "Agregar la extensi�{TORBUTTON_DESC} a Firefox."
LangString TorbuttonFirefoxNotFound ${LANG_SPANISH} "Firefox no se encontr� el sistema. No se puede instalar Torbutton."
+; Miscellaneous Strings
+LangString AppData ${LANG_SPANISH} "Application Data"
+LangString AppDataUninstDesc ${LANG_SPANISH} "Remove saved application data and configuration files."
Modified: trunk/pkg/win32/vidalia_fa.nsh
===================================================================
--- trunk/pkg/win32/vidalia_fa.nsh 2007-08-21 05:38:31 UTC (rev 1847)
+++ trunk/pkg/win32/vidalia_fa.nsh 2007-08-21 07:48:22 UTC (rev 1848)
@@ -55,3 +55,6 @@
LangString TorbuttonAddToFirefoxDesc ${LANG_FARSI} "��� ?��${TORBUTTON_DESC} � ����"
LangString TorbuttonFirefoxNotFound ${LANG_FARSI} "����� ����??� �. ?�?�� ��?���"
+; Miscellaneous Strings
+LangString AppData ${LANG_FARSI} "Application Data"
+LangString AppDataUninstDesc ${LANG_FARSI} "Remove saved application data and configuration files."
Modified: trunk/pkg/win32/vidalia_fi.nsh
===================================================================
--- trunk/pkg/win32/vidalia_fi.nsh 2007-08-21 05:38:31 UTC (rev 1847)
+++ trunk/pkg/win32/vidalia_fi.nsh 2007-08-21 07:48:22 UTC (rev 1848)
@@ -59,3 +59,6 @@
LangString TorbuttonAddToFirefoxDesc ${LANG_FINNISH} "Lis�${TORBUTTON_DESC}-lis�a Firefoxiin."
LangString TorbuttonFirefoxNotFound ${LANG_FINNISH} "Firefox-selainta ei l�nyt koneelta. Torbuttonia ei asennettu."
+; Miscellaneous Strings
+LangString AppData ${LANG_FINNISH} "Application Data"
+LangString AppDataUninstDesc ${LANG_FINNISH} "Remove saved application data and configuration files."
Modified: trunk/pkg/win32/vidalia_fr.nsh
===================================================================
--- trunk/pkg/win32/vidalia_fr.nsh 2007-08-21 05:38:31 UTC (rev 1847)
+++ trunk/pkg/win32/vidalia_fr.nsh 2007-08-21 07:48:22 UTC (rev 1848)
@@ -55,3 +55,6 @@
LangString TorbuttonAddToFirefoxDesc ${LANG_FRENCH} "Ajouter l'extension ${TORBUTTON_DESC} �irefox."
LangString TorbuttonFirefoxNotFound ${LANG_FRENCH} "Firefox n'a pas � trouv�ur votre syst�. Torbutton ne sera pas install�
+; Miscellaneous Strings
+LangString AppData ${LANG_FRENCH} "Application Data"
+LangString AppDataUninstDesc ${LANG_FRENCH} "Remove saved application data and configuration files."
Modified: trunk/pkg/win32/vidalia_it.nsh
===================================================================
--- trunk/pkg/win32/vidalia_it.nsh 2007-08-21 05:38:31 UTC (rev 1847)
+++ trunk/pkg/win32/vidalia_it.nsh 2007-08-21 07:48:22 UTC (rev 1848)
@@ -57,3 +57,7 @@
LangString TorbuttonAddToFirefox ${LANG_ITALIAN} "Aggiungi a Firefox"
LangString TorbuttonAddToFirefoxDesc ${LANG_ITALIAN} "Aggiunge l'estensione ${TORBUTTON_DESC} a Firefox."
LangString TorbuttonFirefoxNotFound ${LANG_ITALIAN} "Firefox non �tato trovato nel sistema. Torbutton non sar�nstallato."
+
+; Miscellaneous Strings
+LangString AppData ${LANG_ITALIAN} "Application Data"
+LangString AppDataUninstDesc ${LANG_ITALIAN} "Remove saved application data and configuration files."
Modified: trunk/pkg/win32/vidalia_nl.nsh
===================================================================
--- trunk/pkg/win32/vidalia_nl.nsh 2007-08-21 05:38:31 UTC (rev 1847)
+++ trunk/pkg/win32/vidalia_nl.nsh 2007-08-21 07:48:22 UTC (rev 1848)
@@ -52,4 +52,8 @@
LangString TorbuttonAppDesc ${LANG_DUTCH} "Installeer ${TORBUTTON_DESC}."
LangString TorbuttonAddToFirefox ${LANG_DUTCH} "Voeg toe aan Firefox"
LangString TorbuttonAddToFirefoxDesc ${LANG_DUTCH} "Voeg de ${TORBUTTON_DESC} extensie toe aan Firefox."
-LangString TorbuttonFirefoxNotFound ${LANG_DUTCH} "Firefox werd niet gevonden op uw systeem. Torbutton wordt niet ge�talleerd."
\ No newline at end of file
+LangString TorbuttonFirefoxNotFound ${LANG_DUTCH} "Firefox werd niet gevonden op uw systeem. Torbutton wordt niet ge�talleerd."
+
+; Miscellaneous Strings
+LangString AppData ${LANG_DUTCH} "Application Data"
+LangString AppDataUninstDesc ${LANG_DUTCH} "Remove saved application data and configuration files."
Modified: trunk/pkg/win32/vidalia_pl.nsh
===================================================================
--- trunk/pkg/win32/vidalia_pl.nsh 2007-08-21 05:38:31 UTC (rev 1847)
+++ trunk/pkg/win32/vidalia_pl.nsh 2007-08-21 07:48:22 UTC (rev 1848)
@@ -55,3 +55,6 @@
LangString TorbuttonAddToFirefoxDesc ${LANG_POLISH} "Dodaj rozszerzenie ${TORBUTTON_DESC} do Firefoxa."
LangString TorbuttonFirefoxNotFound ${LANG_POLISH} "Firefox nie zosta� znaleziony w systemie. Torbutton nie zostanie zainstalowany."
+; Miscellaneous Strings
+LangString AppData ${LANG_POLISH} "Application Data"
+LangString AppDataUninstDesc ${LANG_POLISH} "Remove saved application data and configuration files."
Modified: trunk/pkg/win32/vidalia_pt-br.nsh
===================================================================
--- trunk/pkg/win32/vidalia_pt-br.nsh 2007-08-21 05:38:31 UTC (rev 1847)
+++ trunk/pkg/win32/vidalia_pt-br.nsh 2007-08-21 07:48:22 UTC (rev 1848)
@@ -55,3 +55,6 @@
LangString TorbuttonAddToFirefoxDesc ${LANG_PORTUGUESEBR} "Adicionar a extens�${TORBUTTON_DESC} no Firefox."
LangString TorbuttonFirefoxNotFound ${LANG_PORTUGUESEBR} "O Firefox n�foi encontrado no seu sistema. O Torbutton n�ser�nstalado."
+; Miscellaneous Strings
+LangString AppData ${LANG_PORTUGUESEBR} "Application Data"
+LangString AppDataUninstDesc ${LANG_PORTUGUESEBR} "Remove saved application data and configuration files."
Modified: trunk/pkg/win32/vidalia_ru.nsh
===================================================================
--- trunk/pkg/win32/vidalia_ru.nsh 2007-08-21 05:38:31 UTC (rev 1847)
+++ trunk/pkg/win32/vidalia_ru.nsh 2007-08-21 07:48:22 UTC (rev 1848)
@@ -60,3 +60,6 @@
LangString TorbuttonAddToFirefoxDesc ${LANG_RUSSIAN} "��� ��� ${TORBUTTON_DESC} �irefox."
LangString TorbuttonFirefoxNotFound ${LANG_RUSSIAN} "� �� ��irefox ������. Torbutton ������."
+; Miscellaneous Strings
+LangString AppData ${LANG_RUSSIAN} "Application Data"
+LangString AppDataUninstDesc ${LANG_RUSSIAN} "Remove saved application data and configuration files."
Modified: trunk/pkg/win32/vidalia_sv.nsh
===================================================================
--- trunk/pkg/win32/vidalia_sv.nsh 2007-08-21 05:38:31 UTC (rev 1847)
+++ trunk/pkg/win32/vidalia_sv.nsh 2007-08-21 07:48:22 UTC (rev 1848)
@@ -55,3 +55,6 @@
LangString TorbuttonAddToFirefoxDesc ${LANG_SWEDISH} "L� till till�et ${TORBUTTON_DESC} till Firefox."
LangString TorbuttonFirefoxNotFound ${LANG_SWEDISH} "Torbutton kan ej installeras: Firefox hittades ej p�in dator."
+; Miscellaneous Strings
+LangString AppData ${LANG_SWEDISH} "Application Data"
+LangString AppDataUninstDesc ${LANG_SWEDISH} "Remove saved application data and configuration files."
Modified: trunk/pkg/win32/vidalia_zh-cn.nsh
===================================================================
--- trunk/pkg/win32/vidalia_zh-cn.nsh 2007-08-21 05:38:31 UTC (rev 1847)
+++ trunk/pkg/win32/vidalia_zh-cn.nsh 2007-08-21 07:48:22 UTC (rev 1848)
@@ -55,3 +55,6 @@
LangString TorbuttonAddToFirefoxDesc ${LANG_SIMPCHINESE} "���${TORBUTTON_DESC} �չ���Firefox)��� LangString TorbuttonFirefoxNotFound ${LANG_SIMPCHINESE} "��װ��������Firefox)����˽�ֹͣ���Torbutton �չ."
+; Miscellaneous Strings
+LangString AppData ${LANG_SIMPCHINESE} "Application Data"
+LangString AppDataUninstDesc ${LANG_SIMPCHINESE} "Remove saved application data and configuration files."
Modified: trunk/pkg/win32/vidalia_zh-tw.nsh
===================================================================
--- trunk/pkg/win32/vidalia_zh-tw.nsh 2007-08-21 05:38:31 UTC (rev 1847)
+++ trunk/pkg/win32/vidalia_zh-tw.nsh 2007-08-21 07:48:22 UTC (rev 1848)
@@ -55,3 +55,7 @@
LangString TorbuttonAddToFirefoxDesc ${LANG_TRADCHINESE} "�K�[ ${TORBUTTON_DESC} ��i�ܤ�Firefox)����."
LangString TorbuttonFirefoxNotFound ${LANG_TRADCHINESE} "�w�˵{�ǥ������(Firefox)����,�]���N�����[ Torbutton ��i."
+; Miscellaneous Strings
+LangString AppData ${LANG_TRADCHINESE} "Application Data"
+LangString AppDataUninstDesc ${LANG_TRADCHINESE} "Remove saved application data and configuration files."
+