nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-27 22:03:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

torbutton installation moved to vidalia bundle, comment it out but leave

Browse Source 
it in as a reference


svn:r8811
This commit is contained in:
Andrew Lewman 2006-10-24 01:31:31 +00:00
parent 5ebffb12b0
commit 48a926df67
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/package_nsis-mingw.sh
View File

@ -25,7 +25,7 @@ cp /usr/local/ssl/lib/libssl.a win_tmp/bin/
cp contrib/tor.ico win_tmp/bin/ cp contrib/tor.ico win_tmp/bin/
# YOU must copy torbutton xpi into the contrib dir # 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. # There is no man2html in mingw.
# Maybe we should add this into make dist instead. # Maybe we should add this into make dist instead.

24
contrib/tor-mingw.nsi.in
View File

@ -120,18 +120,18 @@ Section "Documents" Docs
File "..\LICENSE" File "..\LICENSE"
SectionEnd SectionEnd
Section "TorButton for FireFox" Torbutton ;Section "TorButton for FireFox" Torbutton
SetOutPath $INSTDIR ; SetOutPath $INSTDIR
File "${BIN}\torbutton-1.0.4-fx+tb.xpi" ; File "${BIN}\torbutton-1.0.4-fx+tb.xpi"
;
ReadRegStr $1 HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\firefox.exe" "Path" ; 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 ; 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"' ; Exec '"$1firefox.exe" -install-global-extension "$INSTDIR\torbutton-1.0.4-fx+tb.xpi"'
DetailPrint "Torbutton installed" ; DetailPrint "Torbutton installed"
Goto +2 ; Goto +2
MessageBox MB_OK|MB_ICONSTOP "FireFox wasn't found on your system. Not installing Torbutton." ; MessageBox MB_OK|MB_ICONSTOP "FireFox wasn't found on your system. Not installing Torbutton."
DetailPrint "Firefox NOT found." ; DetailPrint "Firefox NOT found."
SectionEnd ;SectionEnd
SubSection /e "Shortcuts" Shortcuts SubSection /e "Shortcuts" Shortcuts