[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[vidalia-svn] r2491: Fare thee well, Privoxy. Polipo is now included in the Windo (vidalia/trunk/pkg/win32)
Author: edmanm
Date: 2008-04-05 23:12:12 -0400 (Sat, 05 Apr 2008)
New Revision: 2491
Modified:
vidalia/trunk/pkg/win32/vidalia-bundle.nsi.in
vidalia/trunk/pkg/win32/vidalia_en.nsh
Log:
Fare thee well, Privoxy. Polipo is now included in the Windows bundle instead
of Privoxy.
Modified: vidalia/trunk/pkg/win32/vidalia-bundle.nsi.in
===================================================================
--- vidalia/trunk/pkg/win32/vidalia-bundle.nsi.in 2008-04-06 00:15:59 UTC (rev 2490)
+++ vidalia/trunk/pkg/win32/vidalia-bundle.nsi.in 2008-04-06 03:12:12 UTC (rev 2491)
@@ -27,10 +27,10 @@
!define TOR_APPVERSION "0.2.0.23-rc"
!define TOR_DESC "${TOR_NAME} ${TOR_APPVERSION}"
-!define PRIVOXY_NAME "Privoxy"
-!define PRIVOXY_EXEC "privoxy.exe"
-!define PRIVOXY_APPVERSION "3.0.6"
-!define PRIVOXY_DESC "${PRIVOXY_NAME} ${PRIVOXY_APPVERSION}"
+!define POLIPO_NAME "Polipo"
+!define POLIPO_EXEC "polipo.exe"
+!define POLIPO_APPVERSION "1.0.4.0"
+!define POLIPO_DESC "${POLIPO_NAME} ${POLIPO_APPVERSION}"
!define TORBUTTON_NAME "Torbutton"
!define TORBUTTON_APPVERSION "1.1.17-alpha"
@@ -165,6 +165,7 @@
File "Vidalia\${VIDALIA_APPVERSION}\LICENSE-GPLV3"
File "Vidalia\${VIDALIA_APPVERSION}\LICENSE-OPENSSL"
File "Vidalia\${VIDALIA_APPVERSION}\CREDITS"
+ WriteIniStr "$INSTDIR\Vidalia\Vidalia Website.url" "InternetShortcut" "URL" "http://www.vidalia-project.net";
; Include a prebuilt GeoIP cache
SetShellVarContext current
@@ -212,8 +213,6 @@
CreateDirectory "${SHORTCUTS}"
CreateShortCut "${SHORTCUTS}\Uninstall.lnk" "$INSTDIR\Uninstall.exe" "" "$INSTDIR\${UNINSTALLER}" 0
CreateShortCut "${SHORTCUTS}\Vidalia.lnk" "$INSTDIR\Vidalia\${VIDALIA_EXEC}" "" "$INSTDIR\Vidalia\${VIDALIA_EXEC}" 0
-
- WriteIniStr "$INSTDIR\Vidalia\Vidalia Website.url" "InternetShortcut" "URL" "http://www.vidalia-project.net";
CreateShortCut "${SHORTCUTS}\Vidalia Website.lnk" "$INSTDIR\Vidalia\Vidalia Website.url"
SectionEnd
@@ -320,69 +319,64 @@
;--------------------------------
-; Privoxy
-var bInstallPrivoxy
-SectionGroup "${PRIVOXY_DESC}" PrivoxyGroup
+; Polipo
+var bInstallPolipo
+SectionGroup "${POLIPO_DESC}" PolipoGroup
;--------------------------------
- ; Privoxy application binaries
- Section "${PRIVOXY_NAME}" Privoxy
+ ; Polipo application binaries
+ Section "${POLIPO_NAME}" Polipo
SectionIn 1 2
; add files / whatever that need to be installed here.
- SetOutPath "$INSTDIR\Privoxy"
- File /r Privoxy\${PRIVOXY_APPVERSION}\*.*
+ SetOutPath "$INSTDIR\Polipo"
+ File Polipo\${POLIPO_APPVERSION}\polipo.exe
+ File Polipo\${POLIPO_APPVERSION}\config
+ File Polipo\${POLIPO_APPVERSION}\CHANGES
+ File Polipo\${POLIPO_APPVERSION}\COPYING
+ File Polipo\${POLIPO_APPVERSION}\README.Windows
+ WriteINIStr "$SMPROGRAMS\Polipo\Polipo Website.url" "InternetShortcut" "URL" "http://www.pps.jussieu.fr/~jch/software/polipo/";
- WriteRegStr HKEY_CLASSES_ROOT "PrivoxyActionFile\shell\open\command" "" 'Notepad.exe "%1"'
- WriteRegStr HKEY_CLASSES_ROOT ".action" "" "PrivoxyActionFile"
- WriteRegStr HKEY_CLASSES_ROOT "PrivoxyFilterFile\shell\open\command" "" 'Notepad.exe "%1"'
- WriteRegStr HKEY_CLASSES_ROOT ".filter" "" "PrivoxyFilterFile"
-
- ; Write the installation path into the registry
- WriteRegStr HKCU SOFTWARE\Privoxy "Install_Dir" "$INSTDIR"
-
; Write the uninstall keys for Windows
- WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Privoxy" "DisplayName" "${PRIVOXY_DESC}"
- WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Privoxy" "UninstallString" '"$INSTDIR\${UNINSTALLER}"'
- WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Privoxy" "NoModify" 1
- WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Privoxy" "NoRepair" 1
-
- IntOp $bInstallPrivoxy 0 + 1
+ WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Polipo" "DisplayName" "${POLIPO_DESC}"
+ WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Polipo" "UninstallString" '"$INSTDIR\${UNINSTALLER}"'
+ WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Polipo" "NoModify" 1
+ WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Polipo" "NoRepair" 1
+
+ ; If the user is installing Vidalia, then update its torrc to remember where Polipo is installed
+ SetShellVarContext current
+ SectionGetFlags ${Vidalia} $0
+ IntOp $0 $0 & ${SF_SELECTED}
+ IntCmp $0 ${SF_SELECTED} write_polipo_location skip skip
+ write_polipo_location:
+ Push $INSTDIR
+ Push "\"
+ Push "\\"
+ Call StrRep
+ Pop $R0 ; contains the modified version of $INSTDIR
+ WriteINIStr "$APPDATA\Vidalia\vidalia.conf" General ProxyExecutable "$R0\\Polipo\\${POLIPO_EXEC}"
+ WriteINIStr "$APPDATA\Vidalia\vidalia.conf" General ProxyExecutableArguments "-c, $R0\\Polipo\\config"
+ WriteINIStr "$APPDATA\Vidalia\vidalia.conf" General RunProxyAtStart "true"
+ skip:
+
+ IntOp $bInstallPolipo 0 + 1
SectionEnd
;--------------------------------
- ; Privoxy Start menu shortcuts
- Section "$(PrivoxyShortcuts)" PrivoxyShortcuts
+ ; Polipo Start menu shortcuts
+ Section "$(PolipoShortcuts)" PolipoShortcuts
SectionIn 1
SetShellVarContext all ; (Add to "All Users" Start Menu if possible)
- RMDir /r "${SHORTCUTS}\Privoxy"
- CreateDirectory "${SHORTCUTS}\Privoxy"
- CreateShortCut "${SHORTCUTS}\Privoxy\Privoxy.lnk" "$INSTDIR\Privoxy\privoxy.exe"
- CreateShortCut "${SHORTCUTS}\Privoxy\Web-based Feedback.lnk" "$INSTDIR\Privoxy\doc\user-manual\contact.html"
- WriteINIStr "${SHORTCUTS}\Privoxy\Web-based Configuration.url" "InternetShortcut" "URL" "http://config.privoxy.org/";
-
- CreateDirectory "${SHORTCUTS}\Privoxy\Edit Config"
- CreateShortCut "${SHORTCUTS}\Privoxy\Edit Config\Main Configuration.lnk" "Notepad.exe" '"$INSTDIR\Privoxy\config.txt"'
- CreateShortCut "${SHORTCUTS}\Privoxy\Edit Config\Default Actions.lnk" "Notepad.exe" '"$INSTDIR\Privoxy\default.action"'
- CreateShortCut "${SHORTCUTS}\Privoxy\Edit Config\User Actions.lnk" "Notepad.exe" '"$INSTDIR\Privoxy\user.action"'
- CreateShortCut "${SHORTCUTS}\Privoxy\Edit Config\Filters.lnk" "Notepad.exe" '"$INSTDIR\Privoxy\default.filter"'
- CreateShortCut "${SHORTCUTS}\Privoxy\Edit Config\Trust list.lnk" "Notepad.exe" '"$INSTDIR\Privoxy\trust.txt"'
-
- CreateDirectory "${SHORTCUTS}\Privoxy\Documentation"
- CreateShortCut "${SHORTCUTS}\Privoxy\Documentation\User Manual.lnk" "$INSTDIR\Privoxy\doc\user-manual\index.html"
- CreateShortCut "${SHORTCUTS}\Privoxy\Documentation\Frequently Asked Questions.lnk" "$INSTDIR\Privoxy\doc\faq\index.html"
- CreateShortCut "${SHORTCUTS}\Privoxy\Documentation\Credits.lnk" "Notepad.exe" '"$INSTDIR\Privoxy\AUTHORS.txt"'
- CreateShortCut "${SHORTCUTS}\Privoxy\Documentation\License.lnk" "Notepad.exe" '"$INSTDIR\Privoxy\LICENSE.txt"'
- CreateShortCut "${SHORTCUTS}\Privoxy\Documentation\ReadMe file.lnk" "Notepad.exe" '"$INSTDIR\Privoxy\README.txt"'
- WriteINIStr "$SMPROGRAMS\Privoxy\Documentation\Web Site.url" "InternetShortcut" "URL" "http://privoxy.org/";
-
+ RMDir /r "${SHORTCUTS}\Polipo"
+ CreateDirectory "${SHORTCUTS}\Polipo"
+ CreateShortCut "${SHORTCUTS}\Polipo\Polipo.lnk" "$INSTDIR\Polipo\polipo.exe" "-c config"
+ CreateShortCut "${SHORTCUTS}\Polipo\Configuration.lnk" "Notepad.exe" '"$INSTDIR\Polipo\config"'
+ CreateShortCut "${SHORTCUTS}\Polipo\Polipo Website.lnk" "$INSTDIR\Polipo\Polipo Website.url"
CreateShortCut "${SHORTCUTS}\Uninstall.lnk" "$INSTDIR\Uninstall.exe" "" "$INSTDIR\${UNINSTALLER}" 0
+
+ CreateDirectory "${SHORTCUTS}\Polipo\Documentation"
+ CreateShortCut "${SHORTCUTS}\Polipo\Documentation\Changelog.lnk" "Notepad.exe" '"$INSTDIR\Polipo\CHANGES"'
+ CreateShortCut "${SHORTCUTS}\Polipo\Documentation\License.lnk" "Notepad.exe" '"$INSTDIR\Polipo\COPYING"'
+ CreateShortCut "${SHORTCUTS}\Polipo\Documentation\Readme.lnk" "Notepad.exe" '"$INSTDIR\Polipo\README.Windows"'
SectionEnd
-
- ;--------------------------------
- ; Run Privoxy at startup
- Section "$(PrivoxyStartup)" PrivoxyStartup
- SectionIn 1
- CreateShortCut "$SMSTARTUP\Privoxy.lnk" "$INSTDIR\Privoxy\privoxy.exe" "" "" 0 SW_SHOWMINIMIZED
- SectionEnd
SectionGroupEnd
;--------------------------------
@@ -439,18 +433,19 @@
IntCmp $bInstallVidalia 1 run_vidalia check_tor check_tor
run_vidalia:
Exec '"$INSTDIR\Vidalia\${VIDALIA_EXEC}"'
- goto check_privoxy
+ goto done
check_tor:
- IntCmp $bInstallTor 1 run_tor check_privoxy check_privoxy
+ IntCmp $bInstallTor 1 run_tor check_polipo check_polipo
run_tor:
Exec '"$INSTDIR\Tor\${TOR_EXEC}"'
-
- check_privoxy:
- IntCmp $bInstallPrivoxy 1 run_privoxy done done
- run_privoxy:
+
+ check_polipo:
+ IntCmp $bInstallPolipo 1 run_polipo done done
+ run_polipo:
SetOutPath "$INSTDIR\Privoxy"
- ExecShell "" '"$INSTDIR\Privoxy\${PRIVOXY_EXEC}"' "" SW_SHOWMINIMIZED
+ Exec '"$INSTDIR\Polipo\${POLIPO_EXEC}" -c config'
+
done:
FunctionEnd
@@ -489,16 +484,11 @@
SectionEnd
SectionGroupEnd
-Section "un.Privoxy ${PRIVOXY_APPVERSION}" UninstallPrivoxy
+Section "un.Polipo ${POLIPO_APPVERSION}" UninstallPolipo
SetShellVarContext all
- RMDir /r "$INSTDIR\Privoxy"
- RMDir /r "${SHORTCUTS}\Privoxy"
- Delete "$SMSTARTUP\Privoxy.lnk"
- DeleteRegKey HKEY_CLASSES_ROOT ".action"
- DeleteRegKey HKEY_CLASSES_ROOT "PrivoxyActionFile"
- DeleteRegKey HKEY_CLASSES_ROOT ".filter"
- DeleteRegKey HKEY_CLASSES_ROOT "PrivoxyFilterFile"
- DeleteRegKey HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Privoxy"
+ RMDir /r "$INSTDIR\Polipo"
+ RMDir /r "${SHORTCUTS}\Polipo"
+ DeleteRegKey HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Polipo"
SectionEnd
; XXX: We still need to find a way to actually remove Torbutton from Firefox
@@ -529,16 +519,16 @@
SectionSetFlags ${UninstallVidalia} $0
CheckVidaliaAppData:
- IfFileExists "$APPDATA\Vidalia\*.*" CheckPrivoxy
+ IfFileExists "$APPDATA\Vidalia\*.*" CheckPolipo
SectionGetFlags ${UninstallVidaliaAppData} $0
IntOp $0 $0 & ${SECTION_OFF}
SectionSetFlags ${UninstallVidaliaAppData} $0
- CheckPrivoxy:
- IfFileExists "$INSTDIR\Privoxy\*.*" Done
- SectionGetFlags ${UninstallPrivoxy} $0
+ CheckPolipo:
+ IfFileExists "$INSTDIR\Polipo\*.*" Done
+ SectionGetFlags ${UninstallPolipo} $0
IntOp $0 $0 & ${SECTION_OFF}
- SectionSetFlags ${UninstallPrivoxy} $0
+ SectionSetFlags ${UninstallPolipo} $0
Done:
FunctionEnd
@@ -547,7 +537,7 @@
SetShellVarContext all
IfFileExists "$INSTDIR\Tor\*.*" DontRemoveTheUninstaller
IfFileExists "$INSTDIR\Vidalia\*.*" DontRemoveTheUninstaller
- IfFileExists "$INSTDIR\Privoxy\*.*" DontRemoveTheUninstaller
+ IfFileExists "$INSTDIR\Polipo\*.*" DontRemoveTheUninstaller
RMDir /r "$INSTDIR"
RMDir /r "${SHORTCUTS}"
DontRemoveTheUninstaller:
@@ -564,10 +554,9 @@
!insertmacro MUI_DESCRIPTION_TEXT ${VidaliaStartup} "$(VidaliaStartupDesc)"
!insertmacro MUI_DESCRIPTION_TEXT ${VidaliaShortcuts} "$(VidaliaShortcutsDesc)"
- !insertmacro MUI_DESCRIPTION_TEXT ${Privoxy} "$(PrivoxyAppDesc)"
- !insertmacro MUI_DESCRIPTION_TEXT ${PrivoxyGroup} "$(PrivoxyGroupDesc)"
- !insertmacro MUI_DESCRIPTION_TEXT ${PrivoxyStartup} "$(PrivoxyStartupDesc)"
- !insertmacro MUI_DESCRIPTION_TEXT ${PrivoxyShortcuts} "$(PrivoxyShortcutsDesc)"
+ !insertmacro MUI_DESCRIPTION_TEXT ${Polipo} "$(PolipoAppDesc)"
+ !insertmacro MUI_DESCRIPTION_TEXT ${PolipoGroup} "$(PolipoGroupDesc)"
+ !insertmacro MUI_DESCRIPTION_TEXT ${PolipoShortcuts} "$(PolipoShortcutsDesc)"
!insertmacro MUI_DESCRIPTION_TEXT ${Torbutton} "$(TorbuttonAppDesc)"
!insertmacro MUI_DESCRIPTION_TEXT ${TorbuttonGroup} "$(TorbuttonGroupDesc)"
@@ -579,7 +568,7 @@
!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_DESCRIPTION_TEXT ${UninstallPolipo} "$(PolipoUninstDesc)"
!insertmacro MUI_UNFUNCTION_DESCRIPTION_END
Modified: vidalia/trunk/pkg/win32/vidalia_en.nsh
===================================================================
--- vidalia/trunk/pkg/win32/vidalia_en.nsh 2008-04-06 00:15:59 UTC (rev 2490)
+++ vidalia/trunk/pkg/win32/vidalia_en.nsh 2008-04-06 03:12:12 UTC (rev 2491)
@@ -26,7 +26,7 @@
; Bundle
LangString BundleSetupCaption ${LANG_ENGLISH} "${BUNDLE_NAME} setup"
-LangString BundleWelcomeText ${LANG_ENGLISH} "This wizard will guide you through the installation of Tor, Vidalia, Privoxy, and Torbutton.\r\n\r\nTor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\r\n\r\nPrivoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups.\r\n\r\nTorbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\r\n\r\nIf you have previously installed Tor, Vidalia, Privoxy, or Firefox, please make sure they are not running before continuing this installation.\r\n\r\n$_CLICK"
+LangString BundleWelcomeText ${LANG_ENGLISH} "This wizard will guide you through the installation of Tor, Vidalia, Polipo, and Torbutton.\r\n\r\nTor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\r\n\r\nPolipo is a caching web proxy that helps make web browsing over Tor more responsive.\r\n\r\nTorbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\r\n\r\nIf you have previously installed Tor, Vidalia, Polipo, or Firefox, please make sure they are not running before continuing this installation.\r\n\r\n$_CLICK"
LangString BundleWelcomeTitle ${LANG_ENGLISH} "Welcome to the ${BUNDLE_NAME} Setup Wizard"
LangString BundleLinkText ${LANG_ENGLISH} "${TOR_NAME} installation documentation"
LangString BundleFinishText ${LANG_ENGLISH} "Installation is complete.\r\nPlease see http://tor.eff.org/docs/tor-doc-win32.html to learn how to configure your applications to use Tor.\r\n\r\nIf you installed Torbutton, you will need to restart Firefox."
@@ -56,14 +56,12 @@
LangString TorShortcuts ${LANG_ENGLISH} "Add to Start Menu"
LangString TorShortcutsDesc ${LANG_ENGLISH} "Add ${TOR_NAME} to your Start menu."
-; Privoxy
-LangString PrivoxyGroupDesc ${LANG_ENGLISH} "Privoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups."
-LangString PrivoxyUninstDesc ${LANG_ENGLISH} "Remove ${PRIVOXY_DESC}."
-LangString PrivoxyAppDesc ${LANG_ENGLISH} "Install ${PRIVOXY_DESC}."
-LangString PrivoxyShortcuts ${LANG_ENGLISH} "Add to Start Menu"
-LangString PrivoxyShortcutsDesc ${LANG_ENGLISH} "Add ${PRIVOXY_NAME} to your Start menu."
-LangString PrivoxyStartup ${LANG_ENGLISH} "Run At Startup"
-LangString PrivoxyStartupDesc ${LANG_ENGLISH} "Automatically run ${PRIVOXY_NAME} at startup."
+; Polipo
+LangString PolipoGroupDesc ${LANG_ENGLISH} "Polipo is a caching web proxy that helps make web browsing over Tor more responsive."
+LangString PolipoUninstDesc ${LANG_ENGLISH} "Remove ${POLIPO_DESC}."
+LangString PolipoAppDesc ${LANG_ENGLISH} "Install ${POLIPO_DESC}."
+LangString PolipoShortcuts ${LANG_ENGLISH} "Add to Start Menu"
+LangString PolipoShortcutsDesc ${LANG_ENGLISH} "Add ${POLIPO_NAME} to your Start menu."
; Torbutton
LangString TorbuttonGroupDesc ${LANG_ENGLISH} "Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing."