diff options
| author | Andrew Lewman <andrew@torproject.org> | 2006-10-18 03:31:13 +0000 |
|---|---|---|
| committer | Andrew Lewman <andrew@torproject.org> | 2006-10-18 03:31:13 +0000 |
| commit | c30a93d4a86219eb1af6aca14c3092d23c9f111d (patch) | |
| tree | 1b8e2a0b1e4feafe2e04a50816019c1675bc39d2 /contrib | |
| parent | efbe87cb6ca59c7ed52f03f8db6d934dc95ef3a9 (diff) | |
| download | tor-c30a93d4a86219eb1af6aca14c3092d23c9f111d.tar tor-c30a93d4a86219eb1af6aca14c3092d23c9f111d.tar.gz | |
Bundle torbutton with mingw installer. Figure out how to get it
installed into Firefox without user intervention is step 2.
svn:r8743
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/package_nsis-mingw.sh | 1 | ||||
| -rw-r--r-- | contrib/tor-mingw.nsi.in | 15 |
2 files changed, 15 insertions, 1 deletions
diff --git a/contrib/package_nsis-mingw.sh b/contrib/package_nsis-mingw.sh index b38fcd71e..e2563f23b 100644 --- a/contrib/package_nsis-mingw.sh +++ b/contrib/package_nsis-mingw.sh @@ -23,6 +23,7 @@ cp src/tools/tor-resolve.exe win_tmp/bin/ cp /usr/local/ssl/lib/libcrypto.a win_tmp/bin/ cp /usr/local/ssl/lib/libssl.a win_tmp/bin/ cp contrib/tor.ico win_tmp/bin/ +cp contrib/torbutton-1.0.4-fx+tb.xpi win_tmp/bin/ # There is no man2html in mingw. # Maybe we should add this into make dist instead. diff --git a/contrib/tor-mingw.nsi.in b/contrib/tor-mingw.nsi.in index 0fecde37e..1ab247868 100644 --- a/contrib/tor-mingw.nsi.in +++ b/contrib/tor-mingw.nsi.in @@ -34,7 +34,7 @@ VIAddVersionKey "FileDescription" "Tor is an implementation of Onion Routing. Yo VIAddVersionKey "FileVersion" "${VERSION}" ;Use upx on the installer header to shrink the size. -!packhdr header.dat "upx --best header.dat" +;!packhdr header.dat "upx --best header.dat" !define MUI_WELCOMEPAGE_TITLE "Welcome to the Tor ${VERSION} Setup Wizard" !define MUI_WELCOMEPAGE_TEXT "This wizard will guide you through the installation of Tor ${VERSION}.\r\n\r\nIf you have previously installed Tor and it is currently running, please exit Tor first before continuing this installation.\r\n\r\n$_CLICK" @@ -125,6 +125,19 @@ Section "Documents" Docs File "..\LICENSE" SectionEnd +Section "TorButton for FireFox" Torbutton + SetOutPath $INSTDIR + File "${BIN}\torbutton-1.0.4-fx+tb.xpi" + + ReadRegStr $1 HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\firefox.exe" "Path" + MessageBox MB_OK "Firefox is installed at $1" + StrCmp $1 "" +1 0 + MessageBox MB_OK "I'm going to run $1firefox.exe --install-global-extension $INSTDIR\torbutton" + Exec '"$1firefox.exe" -install-global-extension $INSTDIR\torbutton-1.0.4-fx+tb.xpi' + Goto +2 + MessageBox MB_OK|MB_ICONSTOP "FireFox wasn't found on your system. Not installing Torbutton." +SectionEnd + SubSection /e "Shortcuts" Shortcuts Section "Start Menu" StartMenu |