diff options
| author | Andrew Lewman <andrew@torproject.org> | 2006-10-24 01:31:31 +0000 |
|---|---|---|
| committer | Andrew Lewman <andrew@torproject.org> | 2006-10-24 01:31:31 +0000 |
| commit | 48a926df67b05a36ddda7d27e0cc487019f5eab2 (patch) | |
| tree | 7d98bbcf681436b73ca4caa1aa9387c9cd1736c5 | |
| parent | 5ebffb12b0300d4a10affb09499727479acd924e (diff) | |
| download | tor-48a926df67b05a36ddda7d27e0cc487019f5eab2.tar.gz tor-48a926df67b05a36ddda7d27e0cc487019f5eab2.zip | |
torbutton installation moved to vidalia bundle, comment it out but leave
it in as a reference
svn:r8811
| -rw-r--r-- | contrib/package_nsis-mingw.sh | 2 | ||||
| -rw-r--r-- | contrib/tor-mingw.nsi.in | 24 |
2 files changed, 13 insertions, 13 deletions
diff --git a/contrib/package_nsis-mingw.sh b/contrib/package_nsis-mingw.sh index 1776c1c3c8..333302ea9e 100644 --- a/contrib/package_nsis-mingw.sh +++ b/contrib/package_nsis-mingw.sh @@ -25,7 +25,7 @@ cp /usr/local/ssl/lib/libssl.a win_tmp/bin/ cp contrib/tor.ico win_tmp/bin/ # YOU must copy torbutton xpi into the contrib dir -cp contrib/torbutton-1.0.4-fx+tb.xpi 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 1c3641ec85..73340102de 100644 --- a/contrib/tor-mingw.nsi.in +++ b/contrib/tor-mingw.nsi.in @@ -120,18 +120,18 @@ 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" - StrCmp $1 "" +2 0 ; if Path is empty or null, then skip to an error, otherwise proceed - Exec '"$1firefox.exe" -install-global-extension "$INSTDIR\torbutton-1.0.4-fx+tb.xpi"' - DetailPrint "Torbutton installed" - Goto +2 - MessageBox MB_OK|MB_ICONSTOP "FireFox wasn't found on your system. Not installing Torbutton." - DetailPrint "Firefox NOT found." -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" +; StrCmp $1 "" +2 0 ; if Path is empty or null, then skip to an error, otherwise proceed +; Exec '"$1firefox.exe" -install-global-extension "$INSTDIR\torbutton-1.0.4-fx+tb.xpi"' +; DetailPrint "Torbutton installed" +; Goto +2 +; MessageBox MB_OK|MB_ICONSTOP "FireFox wasn't found on your system. Not installing Torbutton." +; DetailPrint "Firefox NOT found." +;SectionEnd SubSection /e "Shortcuts" Shortcuts |