mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-11-20 10:12:15 +01:00
torbutton installation moved to vidalia bundle, comment it out but leave
it in as a reference svn:r8811
This commit is contained in:
parent
5ebffb12b0
commit
48a926df67
@ -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.
|
||||
|
@ -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
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user