commit c7478a4fcaa3b0c06c51caf3ba627400865dd5d6 Author: David Fifield david@bamsoftware.com Date: Thu Apr 10 09:14:35 2014 -0700
Add --exit-on-stdin-eof option.
Now it's not hardcoded to happen only on Windows. --- meek-client-torbrowser/linux.go | 2 -- meek-client-torbrowser/mac.go | 2 -- meek-client-torbrowser/meek-client-torbrowser.go | 2 ++ meek-client-torbrowser/windows.go | 3 --- 4 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/meek-client-torbrowser/linux.go b/meek-client-torbrowser/linux.go index c04d098..a5634b2 100644 --- a/meek-client-torbrowser/linux.go +++ b/meek-client-torbrowser/linux.go @@ -5,7 +5,5 @@
package main
-var exitOnStdinEOF = false - var firefoxPath = "Browser/firefox" var firefoxProfilePath = "Data/Browser/profile.meek-http-helper" diff --git a/meek-client-torbrowser/mac.go b/meek-client-torbrowser/mac.go index 7d1f0c3..9588512 100644 --- a/meek-client-torbrowser/mac.go +++ b/meek-client-torbrowser/mac.go @@ -5,7 +5,5 @@
package main
-var exitOnStdinEOF = false - var firefoxPath = "../Contents/MacOS/TorBrowser.app/Contents/MacOS/firefox" var firefoxProfilePath = "../Data/Browser/profile.meek-http-helper" diff --git a/meek-client-torbrowser/meek-client-torbrowser.go b/meek-client-torbrowser/meek-client-torbrowser.go index 0fd66ea..74852d3 100644 --- a/meek-client-torbrowser/meek-client-torbrowser.go +++ b/meek-client-torbrowser/meek-client-torbrowser.go @@ -118,10 +118,12 @@ func runMeekClient(helperAddr string, meekClientCommandLine []string) (cmd *exec }
func main() { + var exitOnStdinEOF bool var logFilename string var err error
flag.Usage = usage + flag.BoolVar(&exitOnStdinEOF, "exit-on-stdin-eof", false, "exit when stdin is closed (use with terminateprocess-buffer)") flag.StringVar(&logFilename, "log", "", "name of log file") flag.Parse()
diff --git a/meek-client-torbrowser/windows.go b/meek-client-torbrowser/windows.go index 150223b..4dbdb47 100644 --- a/meek-client-torbrowser/windows.go +++ b/meek-client-torbrowser/windows.go @@ -5,8 +5,5 @@
package main
-// Workaround for process termination on Windows only. -var exitOnStdinEOF = true - var firefoxPath string = "Browser/firefox.exe" var firefoxProfilePath = "Data/Browser/profile.meek-http-helper"